From 08604d7f08339162238f21e06f848e9606c9ad4e Mon Sep 17 00:00:00 2001
From: Tyron Madlener <tyronx@gmail.com>
Date: Sat, 20 Aug 2011 14:18:53 +0300
Subject: [PATCH 1/3] duplicate rule name

---
 libraries/advisory_rules.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index f13f838890..bbc8d5c6fd 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -127,7 +127,7 @@ rule 'Query cache disabled'
 	The query cache is known to greatly improve performance if configured correctly. Enable it by setting {query_cache_size} to a 2 digit MiB value and setting {query_cache_type} to 'ON'. <b>Note:</b> If you are using memcached, ignore this recommendation.
 	query_cache_size is set to 0 or query_cache_type is set to 'OFF'
 
-rule 'Query cache usage' [!fired('Query cache disabled')]
+rule 'Query caching method' [!fired('Query cache disabled')]
 	Questions / Uptime
 	value > 100
 	Suboptimal caching method.
@@ -141,7 +141,7 @@ rule 'Query cache efficiency (%)' [Com_select + Qcache_hits > 0 && !fired('Query
 	Consider increasing {query_cache_limit}.
 	The current query cache hit rate of %s% is below 20% | round(value,1)
 
-rule 'Query Cache usage' [!fired('Query cache disabled')]
+rule 'Query cache usage' [!fired('Query cache disabled')]
 	100 - Qcache_free_memory / query_cache_size * 100
 	value < 80
 	Less than 80% of the query cache is being utilized.

From 6f20ebf5cfb1fa47fb84cb14729b5000449955de Mon Sep 17 00:00:00 2001
From: Tyron Madlener <tyronx@gmail.com>
Date: Sun, 21 Aug 2011 17:58:30 +0300
Subject: [PATCH 2/3] Fix: Monitor broken from a change by michal

---
 libraries/core.lib.php | 9 +++++++--
 server_status.php      | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index a277f29629..fbc111002f 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -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 . ';');
+    }
 }
 
 ?>
diff --git a/server_status.php b/server_status.php
index 1dd4852369..8d8ecf267b 100644
--- a/server_status.php
+++ b/server_status.php
@@ -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',

From f1b4c72e41d94e23c52e7d58fd000eacdcc5a61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 22 Aug 2011 09:24:53 +0200
Subject: [PATCH 3/3] Revert "Fix: Monitor broken from a change by michal"

This reverts commit 6f20ebf5cfb1fa47fb84cb14729b5000449955de.
---
 libraries/core.lib.php | 9 ++-------
 server_status.php      | 3 +--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index fbc111002f..a277f29629 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -724,16 +724,11 @@ 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, $escaping = true)
+function PMA_AddJSVar($key, $value)
 {
-    if($escaping) {
-        PMA_AddJsCode($key . '=' . PMA_formatJsVal($value) . ';');
-    } else {
-        PMA_AddJsCode($key . '=' . $value . ';');
-    }
+    PMA_AddJsCode(PMA_getJsValue($key, $value));
 }
 
 ?>
diff --git a/server_status.php b/server_status.php
index 8d8ecf267b..1dd4852369 100644
--- a/server_status.php
+++ b/server_status.php
@@ -683,8 +683,7 @@ PMA_AddJSVar(
 );
 PMA_AddJSVar(
     'server_time_diff',
-    'new Date().getTime() - ' . (microtime(true) * 1000),
-    false
+    'new Date().getTime() - ' . (microtime(true) * 1000)
 );
 PMA_AddJSVar(
     'server_os',