gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Monitor broken from a change by michal

Browse Source
This commit is contained in:
Tyron Madlener 2011-08-21 17:58:30 +03:00
parent 5b5344dca7
commit 6f20ebf5cf
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/core.lib.php
View File

@ -724,11 +724,16 @@ function PMA_AddJSCode($str)
*
* @param string $key Name of value to set
* @param mixed $value Value to set, can be either string or array of strings
* @param string $escaping Handle value as-is, don't use PMA_formatJsVal() on it
*
*/
function PMA_AddJSVar($key, $value)
function PMA_AddJSVar($key, $value, $escaping = true)
{
PMA_AddJsCode(PMA_getJsValue($key, $value));
if($escaping) {
PMA_AddJsCode($key . '=' . PMA_formatJsVal($value) . ';');
} else {
PMA_AddJsCode($key . '=' . $value . ';');
}
}
?>

3
server_status.php
View File

@ -683,7 +683,8 @@ PMA_AddJSVar(
);
PMA_AddJSVar(
'server_time_diff',
'new Date().getTime() - ' . (microtime(true) * 1000)
'new Date().getTime() - ' . (microtime(true) * 1000),
false
);
PMA_AddJSVar(
'server_os',