From 4b477a36d105e53f77364d21204a8bb6a28c23e2 Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Tue, 7 Apr 2015 14:53:34 -0300
Subject: [PATCH 01/13] Fixing derivatives hook spelling error

---
 includes/delete_datastream.form.inc | 44 +++++------------------------
 includes/derivatives.inc            |  4 +--
 includes/object_properties.form.inc |  2 +-
 islandora.module                    |  4 +--
 4 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index b88ef0da..346aeeca 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,44 +19,15 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
-  // XXX: Stashed version of datastream is deprecated... Use object and
-  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
-
-  $form_state['datastream_info'] = array(
-    'object_id' => $datastream->parent->id,
-    'datastream_id' => $datastream->id,
-  );
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
-  $dsids = array_unique($dsids);
+  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
   $form['delete_derivatives'] = array(
-    '#title' => t('Delete Derviatives'),
+    '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
-    '#description' => t('Derivatives can be regenerated at a later time.'),
-  );
-  $form['base_info'] = array(
-    '#type' => 'item',
-    '#title' => t('Datastream to be purged'),
-    '#markup' => $dsid,
-    '#states' => array(
-      'invisible' => array(
-        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
-      ),
-    ),
-  );
-  $form['derivative_info'] = array(
-    '#type' => 'item',
-    '#title' => t('Datastream(s) to be purged'),
-    '#description' => t('Including detectable derivatives.'),
-    '#markup' => implode(', ', $dsids),
-    '#states' => array(
-      'visible' => array(
-        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
-      ),
-    ),
+    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -72,7 +43,7 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr
  */
 function islandora_datastream_to_purge(AbstractObject $object, $dsid) {
   module_load_include('inc', 'islandora', 'includes/utilities');
-  $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object));
+  $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
   $hook_filter = function ($hook_def) use ($dsid) {
     return isset($hook_def['source_dsid']) && isset($hook_def['destination_dsid']) ?
       $hook_def['source_dsid'] == $dsid :
@@ -116,10 +87,9 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
-  $object = islandora_object_load($form_state['datastream_info']['object_id']);
-  $datastream_id = $form_state['datastream_info']['datastream_id'];
-  $datastream = $object[$datastream_id];
-
+  $datastream = $form_state['datastream'];
+  $datastream_id = $datastream->id;
+  $object = $datastream->parent;
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);
diff --git a/includes/derivatives.inc b/includes/derivatives.inc
index 7248f03f..74ca2f76 100644
--- a/includes/derivatives.inc
+++ b/includes/derivatives.inc
@@ -83,7 +83,7 @@ function islandora_do_derivatives(AbstractObject $object, array $options) {
   $options += array(
     'force' => FALSE,
   );
-  $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object));
+  $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
   uasort($hooks, 'drupal_sort_weight');
   $results = array();
   $hooks = islandora_filter_derivatives($hooks, $options, $object);
@@ -176,7 +176,7 @@ function islandora_do_batch_derivatives(AbstractObject $object, array $options)
   $options += array(
     'force' => FALSE,
   );
-  $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object));
+  $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
   uasort($hooks, 'drupal_sort_weight');
   $operations = array();
 
diff --git a/includes/object_properties.form.inc b/includes/object_properties.form.inc
index b8fcef7e..ba975803 100644
--- a/includes/object_properties.form.inc
+++ b/includes/object_properties.form.inc
@@ -29,7 +29,7 @@ function islandora_object_properties_form(array $form, array &$form_state, Abstr
   $regenerate_derivatives_access = FALSE;
   if (islandora_object_access(ISLANDORA_REGENERATE_DERIVATIVES, $object)) {
     module_load_include('inc', 'islandora', 'includes/derivatives');
-    $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object));
+    $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
     $hooks = islandora_filter_derivatives($hooks, array('force' => TRUE), $object);
     if (count($hooks) >= 1) {
       $regenerate_derivatives_access = TRUE;
diff --git a/islandora.module b/islandora.module
index cfd045e1..011df6e5 100644
--- a/islandora.module
+++ b/islandora.module
@@ -58,7 +58,7 @@ define('ISLANDORA_DATASTREAM_INGESTED_HOOK', 'islandora_datastream_ingested');
 define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
-define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'islandora_derivative');
+define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
 
 // Autocomplete paths.
 define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');
@@ -1946,7 +1946,7 @@ function islandora_islandora_datastream_access($op, AbstractDatastream $datastre
     module_load_include('inc', 'islandora', 'includes/derivatives');
     $applicable_hook = FALSE;
     $object = $datastream->parent;
-    $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object));
+    $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
     $hooks = islandora_filter_derivatives($hooks, array('force' => TRUE), $object);
     foreach ($hooks as $hook) {
       if (isset($hook['destination_dsid']) && $hook['destination_dsid'] == $datastream->id &&

From 2bdf0424ea328c13f5f5e0074645be69d1590a18 Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 10:33:07 -0300
Subject: [PATCH 02/13] Changes from comments

---
 islandora.module | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/islandora.module b/islandora.module
index 011df6e5..3b948c4f 100644
--- a/islandora.module
+++ b/islandora.module
@@ -58,6 +58,8 @@ define('ISLANDORA_DATASTREAM_INGESTED_HOOK', 'islandora_datastream_ingested');
 define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
+// ISLANDORA_DERVIATIVE_CREATION_HOOK is depricated. Should be removed after next release.
+define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'islandora_derivative');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
 
 // Autocomplete paths.

From 5ca866bc4c6ea68ce6adef4c98408427818a1edb Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 11:07:37 -0300
Subject: [PATCH 03/13] Cleaning up issues

---
 includes/delete_datastream.form.inc | 40 +++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index 346aeeca..18417760 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,15 +19,44 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
+  // XXX: Stashed version of datastream is deprecated... Use object and
+  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
+
+  $form_state['datastream_info'] = array(
+    'object_id' => $datastream->parent->id,
+    'datastream_id' => $datastream->id,
+  );
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_unique($dsids);
   $form['delete_derivatives'] = array(
     '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
-    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
+    '#description' => t('Derivatives can be regenerated at a later time.'),
+  );
+  $form['base_info'] = array(
+    '#type' => 'item',
+    '#title' => t('Datastream to be purged'),
+    '#markup' => $dsid,
+    '#states' => array(
+      'invisible' => array(
+        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
+      ),
+    ),
+  );
+  $form['derivative_info'] = array(
+    '#type' => 'item',
+    '#title' => t('Datastream(s) to be purged'),
+    '#description' => t('Including detectable derivatives.'),
+    '#markup' => implode(', ', $dsids),
+    '#states' => array(
+      'visible' => array(
+        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
+      ),
+    ),
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -87,9 +116,10 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
-  $datastream = $form_state['datastream'];
-  $datastream_id = $datastream->id;
-  $object = $datastream->parent;
+  $object = islandora_object_load($form_state['datastream_info']['object_id']);
+  $datastream_id = $form_state['datastream_info']['datastream_id'];
+  $datastream = $object[$datastream_id];
+
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);

From df4fccdc9bf6ddf37a3b23a850b78657805941d9 Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 11:47:14 -0300
Subject: [PATCH 04/13] Cleaning up issues

---
 islandora.module | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/islandora.module b/islandora.module
index 3b948c4f..9b2aa3ec 100644
--- a/islandora.module
+++ b/islandora.module
@@ -58,7 +58,8 @@ define('ISLANDORA_DATASTREAM_INGESTED_HOOK', 'islandora_datastream_ingested');
 define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
-// ISLANDORA_DERVIATIVE_CREATION_HOOK is depricated. Should be removed after next release.
+// ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
+// as of 7.x-1.5.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'islandora_derivative');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
 

From 2e27a0e5c87ce6974311c21f8072860293d5e674 Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 11:52:02 -0300
Subject: [PATCH 05/13] More Changes

---
 islandora.module | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/islandora.module b/islandora.module
index 9b2aa3ec..56161b69 100644
--- a/islandora.module
+++ b/islandora.module
@@ -58,10 +58,11 @@ define('ISLANDORA_DATASTREAM_INGESTED_HOOK', 'islandora_datastream_ingested');
 define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
+define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
 // ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
 // as of 7.x-1.5.
-define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'islandora_derivative');
-define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
+define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'ISLANDORA_DERIVATIVE_CREATION_HOOK');
+
 
 // Autocomplete paths.
 define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');

From 4c080c99d405a190439c1a15e75a152385bb6dee Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 12:55:03 -0300
Subject: [PATCH 06/13] More Changes

---
 islandora.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/islandora.module b/islandora.module
index 56161b69..121dfb07 100644
--- a/islandora.module
+++ b/islandora.module
@@ -61,7 +61,7 @@ define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
 // ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
 // as of 7.x-1.5.
-define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'ISLANDORA_DERIVATIVE_CREATION_HOOK');
+define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);
 
 
 // Autocomplete paths.

From a7a98a1cce360443f84d3353193dc341fc3f5213 Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Tue, 7 Apr 2015 14:53:34 -0300
Subject: [PATCH 07/13] Adding changes.

---
 includes/delete_datastream.form.inc | 40 ++++-------------------------
 islandora.module                    |  3 +++
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index 18417760..346aeeca 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,44 +19,15 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
-  // XXX: Stashed version of datastream is deprecated... Use object and
-  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
-
-  $form_state['datastream_info'] = array(
-    'object_id' => $datastream->parent->id,
-    'datastream_id' => $datastream->id,
-  );
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
-  $dsids = array_unique($dsids);
+  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
   $form['delete_derivatives'] = array(
     '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
-    '#description' => t('Derivatives can be regenerated at a later time.'),
-  );
-  $form['base_info'] = array(
-    '#type' => 'item',
-    '#title' => t('Datastream to be purged'),
-    '#markup' => $dsid,
-    '#states' => array(
-      'invisible' => array(
-        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
-      ),
-    ),
-  );
-  $form['derivative_info'] = array(
-    '#type' => 'item',
-    '#title' => t('Datastream(s) to be purged'),
-    '#description' => t('Including detectable derivatives.'),
-    '#markup' => implode(', ', $dsids),
-    '#states' => array(
-      'visible' => array(
-        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
-      ),
-    ),
+    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -116,10 +87,9 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
-  $object = islandora_object_load($form_state['datastream_info']['object_id']);
-  $datastream_id = $form_state['datastream_info']['datastream_id'];
-  $datastream = $object[$datastream_id];
-
+  $datastream = $form_state['datastream'];
+  $datastream_id = $datastream->id;
+  $object = $datastream->parent;
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);
diff --git a/islandora.module b/islandora.module
index 121dfb07..11427707 100644
--- a/islandora.module
+++ b/islandora.module
@@ -59,10 +59,13 @@ define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
+<<<<<<< HEAD
 // ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
 // as of 7.x-1.5.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);
 
+=======
+>>>>>>> 4b477a3... Fixing derivatives hook spelling error
 
 // Autocomplete paths.
 define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');

From 62860db507dfa11b586a73d6dadc4d9b185e597d Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 13:29:45 -0300
Subject: [PATCH 08/13] Adding changes.

---
 includes/delete_datastream.form.inc | 40 +++++++++++++++++++++++++----
 islandora.module                    |  7 ++---
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index 346aeeca..18417760 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,15 +19,44 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
+  // XXX: Stashed version of datastream is deprecated... Use object and
+  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
+
+  $form_state['datastream_info'] = array(
+    'object_id' => $datastream->parent->id,
+    'datastream_id' => $datastream->id,
+  );
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_unique($dsids);
   $form['delete_derivatives'] = array(
     '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
-    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
+    '#description' => t('Derivatives can be regenerated at a later time.'),
+  );
+  $form['base_info'] = array(
+    '#type' => 'item',
+    '#title' => t('Datastream to be purged'),
+    '#markup' => $dsid,
+    '#states' => array(
+      'invisible' => array(
+        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
+      ),
+    ),
+  );
+  $form['derivative_info'] = array(
+    '#type' => 'item',
+    '#title' => t('Datastream(s) to be purged'),
+    '#description' => t('Including detectable derivatives.'),
+    '#markup' => implode(', ', $dsids),
+    '#states' => array(
+      'visible' => array(
+        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
+      ),
+    ),
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -87,9 +116,10 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
-  $datastream = $form_state['datastream'];
-  $datastream_id = $datastream->id;
-  $object = $datastream->parent;
+  $object = islandora_object_load($form_state['datastream_info']['object_id']);
+  $datastream_id = $form_state['datastream_info']['datastream_id'];
+  $datastream = $object[$datastream_id];
+
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);
diff --git a/islandora.module b/islandora.module
index 11427707..8c579041 100644
--- a/islandora.module
+++ b/islandora.module
@@ -59,13 +59,10 @@ define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
-<<<<<<< HEAD
-// ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
-// as of 7.x-1.5.
+// The "ISLANDORA_DERVIATIVE_CREATION_HOOK" constant has deprecated as of
+// 7.x-1.5, and should be removed after the next release.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);
 
-=======
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
 
 // Autocomplete paths.
 define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');

From 651967a403eef231173272ae92028bed2c6f2394 Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 13:33:38 -0300
Subject: [PATCH 09/13] Adding changes.

---
 islandora.module | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/islandora.module b/islandora.module
index 8c579041..fa262fa3 100644
--- a/islandora.module
+++ b/islandora.module
@@ -59,8 +59,13 @@ define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
+<<<<<<< HEAD
 // The "ISLANDORA_DERVIATIVE_CREATION_HOOK" constant has deprecated as of
 // 7.x-1.5, and should be removed after the next release.
+=======
+// ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
+// as of 7.x-1.5.
+>>>>>>> parent of a7a98a1... Adding changes.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);
 
 

From 36dbe98b1212784ab54c949b044a797e6fd4d7d0 Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 13:38:22 -0300
Subject: [PATCH 10/13] Adding changes.

---
 includes/delete_datastream.form.inc | 40 ++++-------------------------
 islandora.module                    |  7 +++++
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index 18417760..346aeeca 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,44 +19,15 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
-  // XXX: Stashed version of datastream is deprecated... Use object and
-  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
-
-  $form_state['datastream_info'] = array(
-    'object_id' => $datastream->parent->id,
-    'datastream_id' => $datastream->id,
-  );
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
-  $dsids = array_unique($dsids);
+  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
   $form['delete_derivatives'] = array(
     '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
-    '#description' => t('Derivatives can be regenerated at a later time.'),
-  );
-  $form['base_info'] = array(
-    '#type' => 'item',
-    '#title' => t('Datastream to be purged'),
-    '#markup' => $dsid,
-    '#states' => array(
-      'invisible' => array(
-        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
-      ),
-    ),
-  );
-  $form['derivative_info'] = array(
-    '#type' => 'item',
-    '#title' => t('Datastream(s) to be purged'),
-    '#description' => t('Including detectable derivatives.'),
-    '#markup' => implode(', ', $dsids),
-    '#states' => array(
-      'visible' => array(
-        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
-      ),
-    ),
+    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -116,10 +87,9 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
-  $object = islandora_object_load($form_state['datastream_info']['object_id']);
-  $datastream_id = $form_state['datastream_info']['datastream_id'];
-  $datastream = $object[$datastream_id];
-
+  $datastream = $form_state['datastream'];
+  $datastream_id = $datastream->id;
+  $object = $datastream->parent;
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);
diff --git a/islandora.module b/islandora.module
index fa262fa3..59e1e93c 100644
--- a/islandora.module
+++ b/islandora.module
@@ -60,14 +60,21 @@ define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
 <<<<<<< HEAD
+<<<<<<< HEAD
 // The "ISLANDORA_DERVIATIVE_CREATION_HOOK" constant has deprecated as of
 // 7.x-1.5, and should be removed after the next release.
 =======
 // ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
 // as of 7.x-1.5.
 >>>>>>> parent of a7a98a1... Adding changes.
+=======
+// ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
+// as of 7.x-1.5.
+>>>>>>> parent of 62860db... Adding changes.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);
 
+=======
+>>>>>>> 4b477a3... Fixing derivatives hook spelling error
 
 // Autocomplete paths.
 define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');

From 64c75ef4daed05c75adde852529547e020acd37c Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Wed, 8 Apr 2015 13:50:35 -0300
Subject: [PATCH 11/13] Cleaning something up.

---
 includes/delete_datastream.form.inc | 38 +++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index 346aeeca..14bb8ebe 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,15 +19,43 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
+  // XXX: Stashed version of datastream is deprecated... Use object and
+  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
+  $form_state['datastream_info'] = array(
+    'object_id' => $datastream->parent->id,
+    'datastream_id' => $datastream->id,
+  );
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_unique($dsids);
   $form['delete_derivatives'] = array(
     '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
-    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
+        '#description' => t('Derivatives can be regenerated at a later time.'),
+  );
+  $form['base_info'] = array(
+    '#type' => 'item',
+    '#title' => t('Datastream to be purged'),
+    '#markup' => $dsid,
+    '#states' => array(
+      'invisible' => array(
+        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
+      ),
+    ),
+  );
+  $form['derivative_info'] = array(
+    '#type' => 'item',
+    '#title' => t('Datastream(s) to be purged'),
+    '#description' => t('Including detectable derivatives.'),
+    '#markup' => implode(', ', $dsids),
+    '#states' => array(
+      'visible' => array(
+        ':input[name="delete_derivatives"]' => array('checked' => TRUE),
+      ),
+    ),
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -87,9 +115,9 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
-  $datastream = $form_state['datastream'];
-  $datastream_id = $datastream->id;
-  $object = $datastream->parent;
+  $object = islandora_object_load($form_state['datastream_info']['object_id']);
+  $datastream_id = $form_state['datastream_info']['datastream_id'];
+  $datastream = $object[$datastream_id];
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);

From bae6ee6c8299f6d6b0e90810fc4ff89f5ddd9558 Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Tue, 7 Apr 2015 14:53:34 -0300
Subject: [PATCH 12/13] Some Changes.

---
 includes/delete_datastream.form.inc | 18 ++++++++++++++----
 islandora.module                    |  3 +++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index 14bb8ebe..356b7175 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,21 +19,22 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
-  // XXX: Stashed version of datastream is deprecated... Use object and
-  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
+<<<<<<< HEAD
   $form_state['datastream_info'] = array(
     'object_id' => $datastream->parent->id,
     'datastream_id' => $datastream->id,
   );
+=======
+>>>>>>> 4b477a3... Fixing derivatives hook spelling error
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
-  $dsids = array_unique($dsids);
+  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
   $form['delete_derivatives'] = array(
     '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
+<<<<<<< HEAD
         '#description' => t('Derivatives can be regenerated at a later time.'),
   );
   $form['base_info'] = array(
@@ -56,6 +57,9 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr
         ':input[name="delete_derivatives"]' => array('checked' => TRUE),
       ),
     ),
+=======
+    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
+>>>>>>> 4b477a3... Fixing derivatives hook spelling error
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -115,9 +119,15 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
+<<<<<<< HEAD
   $object = islandora_object_load($form_state['datastream_info']['object_id']);
   $datastream_id = $form_state['datastream_info']['datastream_id'];
   $datastream = $object[$datastream_id];
+=======
+  $datastream = $form_state['datastream'];
+  $datastream_id = $datastream->id;
+  $object = $datastream->parent;
+>>>>>>> 4b477a3... Fixing derivatives hook spelling error
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);
diff --git a/islandora.module b/islandora.module
index 59e1e93c..4eb5af9d 100644
--- a/islandora.module
+++ b/islandora.module
@@ -61,6 +61,7 @@ define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 // The "ISLANDORA_DERVIATIVE_CREATION_HOOK" constant has deprecated as of
 // 7.x-1.5, and should be removed after the next release.
 =======
@@ -73,6 +74,8 @@ define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
 >>>>>>> parent of 62860db... Adding changes.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);
 
+=======
+>>>>>>> 4b477a3... Fixing derivatives hook spelling error
 =======
 >>>>>>> 4b477a3... Fixing derivatives hook spelling error
 

From c56307f8cab5f3f859bac45e10e0859f7f6b08cd Mon Sep 17 00:00:00 2001
From: Kylea Jackson <kylea.jackson4@gmail.com>
Date: Tue, 7 Apr 2015 14:53:34 -0300
Subject: [PATCH 13/13] Rewording comment

---
 includes/delete_datastream.form.inc | 18 ++++--------------
 islandora.module                    | 15 ---------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc
index 356b7175..14bb8ebe 100644
--- a/includes/delete_datastream.form.inc
+++ b/includes/delete_datastream.form.inc
@@ -19,22 +19,21 @@
  *   The drupal form definition.
  */
 function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) {
+  // XXX: Stashed version of datastream is deprecated... Use object and
+  // datastream IDs from 'datastream_info' to acquire.
   $form_state['datastream'] = $datastream;
-<<<<<<< HEAD
   $form_state['datastream_info'] = array(
     'object_id' => $datastream->parent->id,
     'datastream_id' => $datastream->id,
   );
-=======
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
   $object = $datastream->parent;
   $dsid = $datastream->id;
-  $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
+  $dsids = array_unique($dsids);
   $form['delete_derivatives'] = array(
     '#title' => t('Delete Derivatives'),
     '#type' => 'checkbox',
     '#default_value' => 0,
-<<<<<<< HEAD
         '#description' => t('Derivatives can be regenerated at a later time.'),
   );
   $form['base_info'] = array(
@@ -57,9 +56,6 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr
         ':input[name="delete_derivatives"]' => array('checked' => TRUE),
       ),
     ),
-=======
-    '#description' => t('Derivatives can be regenerated at a later time. <p><strong>Datastream(s) to be purged: </strong></p>@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)),
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
   );
   return confirm_form($form,
     t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)),
@@ -119,15 +115,9 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid)
  *   The Drupal form state.
  */
 function islandora_delete_datastream_form_submit(array $form, array &$form_state) {
-<<<<<<< HEAD
   $object = islandora_object_load($form_state['datastream_info']['object_id']);
   $datastream_id = $form_state['datastream_info']['datastream_id'];
   $datastream = $object[$datastream_id];
-=======
-  $datastream = $form_state['datastream'];
-  $datastream_id = $datastream->id;
-  $object = $datastream->parent;
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
   $deleted = FALSE;
   if ($form_state['values']['delete_derivatives']) {
     islandora_datastream_derivatives_purged($object, $datastream_id);
diff --git a/islandora.module b/islandora.module
index 4eb5af9d..8c579041 100644
--- a/islandora.module
+++ b/islandora.module
@@ -59,25 +59,10 @@ define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
 define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
 define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
 define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 // The "ISLANDORA_DERVIATIVE_CREATION_HOOK" constant has deprecated as of
 // 7.x-1.5, and should be removed after the next release.
-=======
-// ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
-// as of 7.x-1.5.
->>>>>>> parent of a7a98a1... Adding changes.
-=======
-// ISLANDORA_DERVIATIVE_CREATION_HOOK is deprecated. Should be removed
-// as of 7.x-1.5.
->>>>>>> parent of 62860db... Adding changes.
 define('ISLANDORA_DERVIATIVE_CREATION_HOOK', ISLANDORA_DERIVATIVE_CREATION_HOOK);
 
-=======
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
-=======
->>>>>>> 4b477a3... Fixing derivatives hook spelling error
 
 // Autocomplete paths.
 define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');