Merge remote-tracking branch 'origin/master'

2017-08-29 15:00:34 +02:00 · 2017-08-29 15:00:34 +02:00 · 970d667b3f
commit 970d667b3f
parent eebc181644 7d0f3d926d
1 changed files with 2 additions and 1 deletions
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@ -9,6 +9,7 @@
 */
 use PhpMyAdmin\ServerStatusData;
 use PhpMyAdmin\Util;
+use PhpMyAdmin\Sanitize;

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