Merge pull request #184 from rosiel/7.x-ISLANDORA-2306

ISLANDORA-2306 Delete all this module's variables.
Islandora · Oct 2, 2018 · c8aaf34 · c8aaf34
2 parents 013f2e8 + a4cf7bb
commit c8aaf34
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/includes/admin.form.inc b/includes/admin.form.inc
@@ -97,7 +97,14 @@ function islandora_large_image_admin_submit($form, &$form_state) {
   $op = $form_state['clicked_button']['#id'];
   switch ($op) {
     case 'edit-reset':
-      variable_del('islandora_large_image_viewers');
+      $variables = array(
+        'islandora_large_image_viewers',
+        'islandora_use_kakadu',
+        'islandora_lossless',
+        'islandora_large_image_uncompress_tiff',
+        'islandora_kakadu_url',
+      );
+      array_walk($variables, 'variable_del');
       break;
   }
 }

diff --git a/islandora_large_image.install b/islandora_large_image.install
@@ -112,6 +112,12 @@ function islandora_large_image_install() {
 function islandora_large_image_uninstall() {
   module_load_include('inc', 'islandora', 'includes/solution_packs');
   islandora_install_solution_pack('islandora_large_image', 'uninstall');
-  $variables = array('islandora_large_image_viewers');
+  $variables = array(
+    'islandora_large_image_viewers',
+    'islandora_use_kakadu',
+    'islandora_lossless',
+    'islandora_large_image_uncompress_tiff',
+    'islandora_kakadu_url',
+  );
   array_walk($variables, 'variable_del');
 }