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

ChangeLog

@@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
 - bug #4744 Opening console scroll down the page
 - bug       Remove extra column heading in view structure page
 - bug       Add missing confirmation when deleting central columns
+- bug       Undefined index DisableIS
 
 4.3.9.0 (2015-02-05)
 - bug #4728 Incorrect headings in routine editor

libraries/common.inc.php

@@ -987,9 +987,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                 . '\'' . PMA_Util::sqlAddSlashes($cfg['Server']['SessionTimeZone']) . '\'';
 
             if(! $userlink->query($sql_query_tz)) {
-                $error_message_tz = sprintf(__('Unable to use timezone %s for server %d. '
+                $error_message_tz = sprintf(__('Unable to use timezone %1$s for server %2$d. '
                     . 'Please check your configuration setting for '
-                    . '[em]$cfg[\'Servers\'][%d][\'SessionTimeZone\'][/em]. '
+                    . '[em]$cfg[\'Servers\'][%3$d][\'SessionTimeZone\'][/em]. '
                     . 'phpMyAdmin is currently using the default time zone of the database server.'),
                     $cfg['Servers'][$GLOBALS['server']]['SessionTimeZone'],
                     $GLOBALS['server'],

libraries/navigation/Nodes/Node.class.php

@@ -369,7 +369,9 @@ class Node
         if (!$GLOBALS['cfg']['NavigationTreeEnableGrouping']
             || !$GLOBALS['cfg']['ShowDatabasesNavigationAsTree']
         ) {
-            if (! $GLOBALS['cfg']['Server']['DisableIS']) {
+            if (isset($GLOBALS['cfg']['Server']['DisableIS'])
+                && ! $GLOBALS['cfg']['Server']['DisableIS']
+            ) {
                 $query  = "SELECT `SCHEMA_NAME` ";
                 $query .= "FROM `INFORMATION_SCHEMA`.`SCHEMATA` ";
                 $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
@@ -426,7 +428,9 @@ class Node
         }
 
         $dbSeparator = $GLOBALS['cfg']['NavigationTreeDbSeparator'];
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
+        if (isset($GLOBALS['cfg']['Server']['DisableIS'])
+            && ! $GLOBALS['cfg']['Server']['DisableIS']
+        ) {
             $query  = "SELECT `SCHEMA_NAME` ";
             $query .= "FROM `INFORMATION_SCHEMA`.`SCHEMATA`, ";
             $query .= "(";
@@ -558,7 +562,9 @@ class Node
         if (!$GLOBALS['cfg']['NavigationTreeEnableGrouping']
             || !$GLOBALS['cfg']['ShowDatabasesNavigationAsTree']
         ) {
-            if (!$GLOBALS['cfg']['Server']['DisableIS']) {
+            if (isset($GLOBALS['cfg']['Server']['DisableIS'])
+                && ! $GLOBALS['cfg']['Server']['DisableIS']
+            ) {
                 $query = "SELECT COUNT(*) ";
                 $query .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
                 $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);