From 83f24859add77656fb9764c31a176c223df999fe Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Mon, 15 Sep 2014 11:50:16 -0400
Subject: [PATCH] Re-remove islandora_ingest_form_prepare_new_object && call to
 it in function islandora_ingest_form.

---
 includes/ingest.form.inc | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc
index 1187c55b..a95e1b25 100644
--- a/includes/ingest.form.inc
+++ b/includes/ingest.form.inc
@@ -81,9 +81,6 @@ function islandora_ingest_form(array $form, array &$form_state, array $configura
 function islandora_ingest_form_init_form_state_storage(array &$form_state, array $configuration) {
   if (empty($form_state['islandora'])) {
     $objects = isset($configuration['objects']) ? $configuration['objects'] : array();
-    if (empty($objects)) {
-      $objects[] = islandora_ingest_form_prepare_new_object($configuration);
-    }
     $configuration['models'] = isset($configuration['models']) ? $configuration['models'] : array();
     // Make sure the models actually exist.
     foreach ($configuration['models'] as $key => $model) {
@@ -136,33 +133,6 @@ 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.
  *