Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin

phpmyadmin · Jun 29, 2012 · b1b674a · b1b674a
2 parents dd2cf47 + 79925de
commit b1b674a
Show file tree

Hide file tree

Showing 6 changed files with 489 additions and 156 deletions.
diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
@@ -425,7 +425,7 @@ private function _getServerTabs()
     {
         $is_superuser = PMA_isSuperuser();
         $binary_logs = null;
-        if (! PMA_DRIZZLE) {
+        if (!defined('PMA_DRIZZLE') || (defined('PMA_DRIZZLE') && ! PMA_DRIZZLE)) {
             $binary_logs = PMA_DBI_fetch_result(
                 'SHOW MASTER LOGS',
                 'Log_name',
@@ -495,7 +495,7 @@ private function _getServerTabs()
         $tabs['charset']['link'] = 'server_collations.php';
         $tabs['charset']['text'] = __('Charsets');
 
-        if (PMA_DRIZZLE) {
+        if (defined('PMA_DRIZZLE') && PMA_DRIZZLE) {
             $tabs['plugins']['icon'] = 'b_engine.png';
             $tabs['plugins']['link'] = 'server_plugins.php';
             $tabs['plugins']['text'] = __('Plugins');