Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

2017-08-29 15:00:52 +02:00 · 2017-08-29 15:00:52 +02:00 · d84ed95285
commit d84ed95285
parent 0ad3507b3b 2f04cdaa7a
2 changed files with 3 additions and 2 deletions
--- a/libraries/SysInfo.php
+++ b/libraries/SysInfo.php
@ -45,4 +45,4 @@ class SysInfo
    {
        return true;
    }
-}
+}
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@ -9,6 +9,7 @@
 */
 use PMA\libraries\ServerStatusData;
 use PMA\libraries\Util;
+use PMA\libraries\Sanitize;

 /**
 * Prints html with monitor
@ -42,7 +43,7 @@ function PMA_getHtmlForMonitor($ServerStatusData)
            if ($i++ > 0) {
                $retval .= ", ";
            }
-            $retval .= "'" . $name . "'";
+            $retval .= Sanitize::formatJsVal($name);
        }
    }
    $retval .= '];';