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] 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