From 96a2c32a29e2c25d27087e3dcac19a46479e529b Mon Sep 17 00:00:00 2001 From: Kylea Jackson Date: Tue, 3 Mar 2015 15:16:40 -0400 Subject: [PATCH] Cleaning up last bit of code standard issues --- includes/delete_datastream.form.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc index b45c6da6..d4a46b8b 100644 --- a/includes/delete_datastream.form.inc +++ b/includes/delete_datastream.form.inc @@ -1,8 +1,10 @@ t('Delete Derviatives'), + '#title' => t('Delete Derviatives'), '#type' => 'checkbox', '#default_value' => 0, ); @@ -33,7 +35,6 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr } /** * Purge a given DSID's derivative datastreams on an object. - * */ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid) { module_load_include('inc', 'islandora', 'includes/utilities'); @@ -44,7 +45,8 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid) $dsids = array_map($dsid_map, $hooks); array_map(array($object, 'purgeDatastream'), $dsids); } -/** Submit handler for the delete datastream form. +/** + * Submit handler for the delete datastream form. * * Purges/Delete's the given AbstractDatastream if possible. * @@ -62,10 +64,9 @@ function islandora_delete_datastream_form_submit(array $form, array &$form_state $datastream_id = $datastream->id; $object = $datastream->parent; $deleted = FALSE; - - if($form_state['values']['delete_derivatives']){ + if ($form_state['values']['delete_derivatives']) { islandora_datastream_derivatives_purged($object, $datastream_id); - } + } try { $deleted = islandora_delete_datastream($datastream); }