From c19bb4b3d2cb27c84172f5bc21c103d1c87bd869 Mon Sep 17 00:00:00 2001
From: MorganDawe <mdawe@discoverygarden.com>
Date: Thu, 8 May 2014 12:42:57 +0000
Subject: [PATCH] Updated settings logic.

---
 includes/admin.form.inc | 6 ++----
 theme/theme.inc         | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/includes/admin.form.inc b/includes/admin.form.inc
index 148dce9e..69f09fd2 100644
--- a/includes/admin.form.inc
+++ b/includes/admin.form.inc
@@ -86,17 +86,15 @@ function islandora_repository_admin(array $form, array &$form_state) {
       'islandora_ds_replace_exclude' => array(
         '#type' => 'fieldset',
         '#title' => t('Excluded DSID'),
-        'islandora_namespace_restriction_enforced' => array(
+        'islandora_ds_replace_exclude_enforced' => array(
           '#type' => 'textfield',
           '#title' => t('Enforce DSID restrictions'),
           '#description' => t("A comma seperated list, allowing administrator to restrict user's access to replace a versionable datastreams latest version"),
-          '#default_value' => variable_get('islandora_namespace_restriction_enforced', 'RELS-EXT,RELS-INT'),
+          '#default_value' => variable_get('islandora_ds_replace_exclude_enforced', 'RELS-EXT,RELS-INT'),
         ),
       ),
     ),
   );
-  $var_string = variable_get('islandora_namespace_restriction_enforced', 'RELS-EXT,RELS-INT');
-  dsm($var_string, "hehe");
   return system_settings_form($form);
 }
 
diff --git a/theme/theme.inc b/theme/theme.inc
index aee411a4..9eca2926 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -456,13 +456,10 @@ function theme_islandora_datastream_version_link(array $vars) {
  */
 function theme_islandora_datastream_replace_link(array $vars) {
   $datastream = $vars['datastream'];
-  //TODO: RELS-EXT and RELS-INT should never be replaced, but should
-  // be moved out into configuration somewhere. Hard coded === bad time.
   if (islandora_datastream_access(ISLANDORA_REPLACE_DATASTREAM, $datastream) &&
       islandora_datastream_access(ISLANDORA_ADD_NEW_DATASTREAM_VERSION, $datastream)) {
-    $var_string = variable_get("islandora_namespace_restriction_enforced", "RELS-EXT,RELS-INT");
-    $replace_exclude = explode($var_string, ",");
-    dsm($var_string, "var string");
+    $var_string = variable_get("islandora_ds_replace_exclude_enforced", "RELS-EXT,RELS-INT");
+    $replace_exclude = explode(",", $var_string);
     if (!in_array($datastream->id, $replace_exclude)) {
       return l(t('replace'), "islandora/object/{$datastream->parent->id}/datastream/{$datastream->id}/replace");
     }