Merge https://github.com/Islandora/islandora into ISLANDORA-250

ObjectHelper.inc

@@ -363,7 +363,7 @@ class ObjectHelper {
     $ds_list = $item->get_datastreams_list_as_array();
     $output = $this->getFormattedDC($item);
     $dsid = array_key_exists('QDC', $ds_list) ? 'QDC' : 'DC';
-      
+    $path = drupal_get_path('module', 'fedora_repository');
     
     //$baseUrl=substr($baseUrl, 0, (strpos($baseUrl, "/")-1));
     if (user_access(ObjectHelper :: $EDIT_FEDORA_METADATA)) {
@@ -374,7 +374,7 @@ class ObjectHelper {
       if ($allow) {
 
         $output .= '<br /><a title = "' . t('Edit Meta Data') . '" href="' . $base_url . '/fedora/repository/' . 'editmetadata/' . $pid . '/' .
-            $dsId . '"><img src="' . $base_url . '/' . $path . '/images/edit.gif" alt="' . t('Edit Meta Data') . '" /></a>';
+            $dsid . '"><img src="' . $base_url . '/' . $path . '/images/edit.gif" alt="' . t('Edit Meta Data') . '" /></a>';
 
       }
     }
@@ -850,6 +850,10 @@ class ObjectHelper {
     module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
     // Before executing the query, we hve a base case of accessing the top-level collection
     global $base_url;
+    if ($pid == variable_get('fedora_repository_pid', 'islandora:top')){
+        $breadcrumbs[] = l(t('Digital repository'), 'fedora/repository');
+        $breadcrumbs[] = l(t('Home'), $base_url);
+    } else {
       $query_string = 'select $parentObject $title $content from <#ri>
                                where (<info:fedora/' . $pid . '> <dc:title> $title
                                and $parentObject <fedora-model:hasModel> $content
@@ -874,13 +878,12 @@ class ObjectHelper {
         if ($parent == variable_get('fedora_repository_pid', 'islandora:top')) {
           $breadcrumbs[] = l(t('Digital repository'), 'fedora/repository');
           $breadcrumbs[] = l(t('Home'), $base_url);
-        
-        
         } elseif ($level > 0) {
           $this->getBreadcrumbs($parent, $breadcrumbs, $level - 1);
         }
       }
     }
+  }
 
   public static function warnIfMisconfigured($app) {
     $messMap = array(

fedora_repository.module

@@ -22,9 +22,7 @@ function fedora_repository_admin() {
   return $adminForm->createAdminForm();
 }
 
-function fedora_repository_admin_settings_submit($form, $form_values) {
+
-  drupal_set_message("Custom form handler.");
-}
 
 /**
  * drupal hook

formClass.inc

@@ -380,8 +380,7 @@ class formClass {
 
     $form['#attributes'] = array('enctype' => "multipart/form-data");
 
-    // Additional form handling for file uploads.
+
-    $form['#submit'][] = 'fedora_repository_admin_settings_submit';
     return system_settings_form($form);
   }