- merge r2355 from 1.7 to trunk: fix display of menubar related tags in IE7

- optimized sql query in permalinks
- remove some unused global variable declarations
- fix bug in admin/themeconf.inc.php

git-svn-id: http://piwigo.org/svn/trunk@2356 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 3 insertions, 3 deletions

diff --git a/template/yoga/theme/admin/themeconf.inc.php b/template/yoga/theme/admin/themeconf.inc.php
index ab68d89e3..5a6450e82 100644
--- a/template/yoga/theme/admin/themeconf.inc.php
+++ b/template/yoga/theme/admin/themeconf.inc.php
@@ -14,12 +14,12 @@ function selected_admin_menu()
       case 'cat_list':
       case 'cat_modify':
       case 'cat_move':
-      case 'cat_options':      
+      case 'cat_options':
       case 'element_set':
       case 'cat_perm':
       case 'permalinks':
       case 'picture_modify':
-        if (isset($_GET['cat']) and $_GET['cat']='caddie') {
+        if (isset($_GET['cat']) and $_GET['cat']=='caddie') {
           return 3;
         }
         return 2;
@@ -40,7 +40,7 @@ function selected_admin_menu()
       case 'plugins_list':
       case 'plugin':
         return 5;
-    } 
+    }
   }
   return 0;
 }