From d665bb742e0d4013c5f2c1ab7f5bf843505aa54a Mon Sep 17 00:00:00 2001
From: cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Mon, 22 Feb 2010 19:41:21 +0000
Subject: [PATCH] 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
---
 data/templates/bookmarks.tpl.php | 2 +-
 doc/ChangeLog                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index ad2ecd3..1caf0e7 100644
--- 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 05757ac..65ed2e2 100644
--- 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