Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -30,6 +30,8 @@ phpMyAdmin - ChangeLog
 - bug #3889 When login fails and error display is active, login data is
 displayed (regression)
 - bug #4247 open_basedir warnings on export page
+- bug #4013 AJAX request waiting until version info is retrieved
+- bug #4248 js error when changing number of columns in status monitor
 
 4.1.5.0 (2014-01-17)
 - bug #3780 Allow aborting loading pages

js/server_status_monitor.js

@@ -440,15 +440,6 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             row++;
         }
 
-        /* Apply new chart size to all charts */
-        $.each(runtime.charts, function (key, value) {
-            value.chart.setSize(
-                newSize.width,
-                newSize.height,
-                false
-            );
-        });
-
         if (monitorSettings.gridMaxPoints == 'auto') {
             runtime.gridMaxPoints = Math.round((newSize.width - 40) / 12);
         }

libraries/replication.inc.php

@@ -124,7 +124,9 @@ foreach ($replication_types as $type) {
             ${"server_{$type}_Do_DB"} = explode(
                 ",", $server_slave_replication[0]["Replicate_Do_DB"]
             );
-            $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"};
+            if (! empty(${"server_{$type}_Do_DB"})) {
+                $replication_info[$type]['Do_DB'] = ${"server_{$type}_Do_DB"};
+            }
 
             ${"server_{$type}_Ignore_DB"} = explode(
                 ",", $server_slave_replication[0]["Replicate_Ignore_DB"]