change handling of GLOBAL_ENABLE_LABELS when disabled

diff --git a/backend.php b/backend.php
index 72b563d0524db17777e682a053168393dd479f06..dff780b1f1a159f07f997bc36cd6ed887b839be8 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -2252,6 +2252,8 @@
        if ($op == "pref-labels") {
 
                if (!GLOBAL_ENABLE_LABELS) { 
+
+                       print "<p>Sorry, labels have been administratively disabled for this installation. Please contact instance owner or edit configuration file to enable this functionality.</p>";
                        return; 
                }
 

diff --git a/prefs.php b/prefs.php
index a5efa356ffd12b8a912572df4abfd2e940cd603d..1e9aadd51f86650363d0c8eed9d1d55c995186bd 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -132,7 +132,7 @@ window.onload = init;
                <? } ?>
                <input id="filterConfigTab" class="prefsTab" type="submit" value="Content Filtering"
                        onclick="selectTab('filterConfig')">
-               <? if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) { ?>
+               <? if (get_pref($link, 'ENABLE_LABELS')) { ?>
                <input id="labelConfigTab" class="prefsTab" type="submit" value="Label Editor"
                        onclick="selectTab('labelConfig')">
                <? } ?>