Merge branch 'QA_4_6' into QA_4_6-security

phpmyadmin · Sep 2, 2016 · 3d99185 · 3d99185
2 parents c461374 + e803cae
commit 3d99185
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
 - issue #12292 Unable to edit transformations
 - issue #12502 Remove unused paramenter when connecting to MySQLi
 - issue #12303 Fix number formatting with different settings of precision in PHP
+- issue #12405 Use single quotes in PHP code
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29

diff --git a/libraries/Util.php b/libraries/Util.php
@@ -1167,7 +1167,7 @@ public static function getMessage(
             }
 
             if (! empty($GLOBALS['show_as_php'])) {
-                $query_base = '$sql  = "' . $query_base;
+                $query_base = '$sql  = \'' . $query_base;
             } elseif (isset($query_base)) {
                 $query_base = self::formatSql($query_base);
             }
@@ -1311,7 +1311,7 @@ public static function getMessage(
 
             //Clean up the end of the PHP
             if (! empty($GLOBALS['show_as_php'])) {
-                $retval .= '";';
+                $retval .= '\';';
             }
             $retval .= '</div>';