Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x

includes/add_datastream.form.inc

@@ -32,7 +32,7 @@ function islandora_add_datastream_form(array $form, array &$form_state, FedoraOb
     '#attributes' => array(
       'enctype' => 'multipart/form-data',
     ),
-    'fieldset' => array(
+    'dsid' => array(
       '#type' => 'fieldset',
       '#title' => 'Add a datastream',
       '#collapsible' => FALSE,

includes/dublin_core.inc

@@ -151,7 +151,7 @@ class DublinCore {
    */
   public static function importFromXMLString($dc_xml) {
     $dc_doc = new DomDocument();
-    if ($dc_doc->loadXML($dc_xml)) {
+    if (!empty($dc_xml) && $dc_doc->loadXML($dc_xml)) {
       $oai_dc = $dc_doc->getElementsByTagNameNS('http://purl.org/dc/elements/1.1/', '*');
       $new_dc = new DublinCore();
       foreach ($oai_dc as $child) {
@@ -161,9 +161,7 @@ class DublinCore {
       }
       return $new_dc;
     }
-    else {
     return NULL;
   }
-  }
 
 }

includes/ingest.form.inc

@@ -295,11 +295,15 @@ function islandora_ingest_form_execute_step(array $form, array &$form_state) {
  * @return array
  *   The stepified drupal form definition for the given step.
  */
-function islandora_ingest_form_stepify(array $form, array &$form_state) {
+function islandora_ingest_form_stepify(array $form, array &$form_state, $step) {
   $first_step = islandora_ingest_form_on_first_step($form_state);
   $last_step = islandora_ingest_form_on_last_step($form_state);
   $form['prev'] = $first_step ? NULL : islandora_ingest_form_previous_button($form_state);
   $form['next'] = $last_step ? islandora_ingest_form_ingest_button($form_state) : islandora_ingest_form_next_button($form_state);
+
+  // Allow for a hook_form_FORM_ID_alter().
+  drupal_alter(array('form_' . $step['form_id'], 'form'), $form, $form_state, $step['form_id']);
+
   return $form;
 }
 

theme/theme.inc

@@ -107,20 +107,16 @@ function islandora_preprocess_islandora_default(&$variables) {
     }
   }
   $variables['datastreams'] = $datastreams;
-  try {
+  // Objects in fcrepo4 don't always contain a DC datastream.
-    $dc = $islandora_object['DC']->content;
+  if (isset($islandora_object['DC'])) {
-    $dc_object = DublinCore::importFromXMLString($dc);
+    $dc_object = DublinCore::importFromXMLString($islandora_object['DC']->content);
     $dc_array = $dc_object->asArray();
   }
-  catch (Exception $e) {
-    drupal_set_message(t('Error retrieving object %s %t', array('%s' => $islandora_object->id, '%t' => $e->getMessage())), 'error', FALSE);
-  }
   $variables['dc_array'] = isset($dc_array) ? $dc_array : array();
   $variables['islandora_dublin_core'] = isset($dc_object) ? $dc_object : NULL;
   $variables['islandora_object_label'] = $islandora_object->label;
-  global $base_url;
   if (isset($islandora_object['TN'])) {
-    $variables['islandora_thumbnail_url'] = $base_url . '/islandora/object/' . $islandora_object->id . '/datastream/TN/view';
+    $variables['islandora_thumbnail_url'] = url("islandora/object/{$islandora_object->id}/datastream/TN/view");
   }
 }