summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGravatar cweiske2010-02-22 19:41:21 +0000
committerGravatar cweiske2010-02-22 19:41:21 +0000
commitd665bb742e0d4013c5f2c1ab7f5bf843505aa54a (patch)
treec4d77e69bb3f1a1fa1ade122d8e22a89a972d944
parent858b188f87898099a4824d07fbcdf892a76c1876 (diff)
downloadscuttle-d665bb742e0d4013c5f2c1ab7f5bf843505aa54a.tar.gz
scuttle-d665bb742e0d4013c5f2c1ab7f5bf843505aa54a.zip
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
-rw-r--r--data/templates/bookmarks.tpl.php2
-rw-r--r--doc/ChangeLog1
2 files changed, 2 insertions, 1 deletions
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