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

2014-05-19 07:39:39 -04:00 · 2014-05-19 07:39:39 -04:00 · 9b15ce4d27
commit 9b15ce4d27
parent 24720826cc 437c717eb3
1 changed files with 1 additions and 1 deletions
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@ -587,7 +587,7 @@ function PMA_getJsonForChartingDataSwitch(
            $memory = $sysinfo->memory();
        }

-        $ret['value'] = $memory[$pName];
+        $ret['value'] = isset($memory[$pName]) ? $memory[$pName] : 0;
        break;
    }