From 690fb4c70ebd61360d8e95188a71d65487248738 Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Mon, 15 Sep 2014 08:17:50 -0400
Subject: [PATCH] Put function islandora_ingest_form_prepare_new_object back
 in.

---
 includes/ingest.form.inc | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc
index 6af93d63..1187c55b 100644
--- a/includes/ingest.form.inc
+++ b/includes/ingest.form.inc
@@ -136,6 +136,33 @@ function islandora_ingest_form_get_last_step_id(array &$form_state) {
   return array_pop($keys);
 }
 
+/**
+ * Prepares a new object based on the given configuration.
+ *
+ * @param array $configuration
+ *  The list of key/value pairs of configuration.
+ *
+ *  @return NewFedoraObject
+ *   The new object.
+ */
+function islandora_ingest_form_prepare_new_object(array $configuration) {
+  module_load_include('inc', 'islandora', 'includes/utilities');
+  if (empty($configuration['object'])) {
+    $message = islandora_deprecated('7.x-1.2', t('Please use "objects" as the default ingest form configuration property.'));
+    trigger_error(filter_xss($message), E_USER_DEPRECATED);
+    // ID is more specific than namespace so it will take precedence.
+    $id = isset($configuration['namespace']) ? $configuration['namespace'] : 'islandora';
+    $id = isset($configuration['id']) ? $configuration['id'] : $id;
+    $label = isset($configuration['label']) ? $configuration['label'] : 'New Object';
+    $relationship_map = function($o) {
+      return array('relationship' => 'isMemberOfCollection', 'pid' => $o);
+    };
+    $relationships = empty($configuration['collections']) ? array() : array_map($relationship_map, $configuration['collections']);
+    return islandora_prepare_new_object($id, $label, array(), array(), $relationships);
+  }
+  return $configuration['object'];
+}
+
 /**
  * Gets the given/current step.
  *