Merge pull request #361 from adam-vessey/7.x-steps-ingest-by-reference

Use references when ingesting during steps.

.travis.yml

@@ -4,7 +4,7 @@ php:
   - 5.4
 branches:
   only:
-    - 7.x
+    - /^7.x/
 env:
   - FEDORA_VERSION="3.5"
   - FEDORA_VERSION="3.6.2"

includes/ingest.form.inc

@@ -703,7 +703,7 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
     islandora_ingest_form_execute_consecutive_callback_steps($form, $form_state, $step);
   }
   // Ingest the objects.
-  foreach ($form_state['islandora']['objects'] as $object) {
+  foreach ($form_state['islandora']['objects'] as &$object) {
     try {
       islandora_add_object($object);
       $form_state['redirect'] = "islandora/object/{$object->id}";
@@ -715,6 +715,9 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
       drupal_set_message(t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.', array('@label' => $object->label, '@pid' => $object->id)), 'error');
     }
   }
+  // XXX: Foreaching with references can be weird... The reference exists in
+  // the scope outside.
+  unset($object);
 }
 
 /**