diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-22 13:18:26 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-22 13:18:26 +0400 |
| commit | 1c2dbf0cbb4793837701014b66a522727bda144d (patch) | |
| tree | d1e7c1f11a3e7eca89c285b2551ad92eafd67877 /server_status.php | |
| parent | e5157838e52aecb9d8dfdd1a68be3c6049183634 (diff) | |
| parent | c5eb1f4d79b4095e91a0201628cc353fd19365fb (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
libraries/advisory_rules.txt
Diffstat (limited to 'server_status.php')
| -rw-r--r-- | server_status.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server_status.php b/server_status.php index 299f971b27..66244c2d18 100644 --- a/server_status.php +++ b/server_status.php @@ -134,7 +134,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'cpu': if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); + require_once 'libraries/sysinfo.lib.php'; $sysinfo = getSysInfo(); } if (!$cpuload) { @@ -151,7 +151,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'memory': if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); + require_once 'libraries/sysinfo.lib.php'; $sysinfo = getSysInfo(); } if (!$memory) { @@ -390,7 +390,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['advisor'])) { - include('libraries/Advisor.class.php'); + include 'libraries/Advisor.class.php'; $advisor = new Advisor(); exit(json_encode($advisor->run())); } @@ -717,7 +717,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', |