Do not highlight admin bookmarks when $enableAdminColors is disabled

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@684 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index ad2ecd3b01ac175e4ae86a8c092b4ba80c47a29d..1caf0e71004f8a7fadf80f3450d423b90b6fb3f7 100644 (file)
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@ -312,7 +312,7 @@ if($currenttag!= '') {
                }
 
                // Admin specific design
-               if ($userservice->isAdmin($row['username'])) {
+               if ($userservice->isAdmin($row['username']) && $GLOBALS['enableAdminColors']) {
                        $adminBgClass = 'class="adminBackground"';
                        $adminStar = ' <img src="'. ROOT .'images/logo_24.gif" width="12px" title="'. T_('This bookmark is certified by an admin user.') .'" />';
                } else {

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 05757ace1e3517713976940ac1a596cb3cc00432..65ed2e20f1e191412780b33fb118cbd49f9d2109 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog for SemantiScuttle
 -------------------
 - Many SQL optimizations
 - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames
+- Do not highlight admin bookmarks when $enableAdminColors is disabled
 
 
 0.96.1 - 2010-02-09