Merge branch 'master' into master-security

ChangeLog

@@ -48,6 +48,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

libraries/Util.php

@@ -1158,7 +1158,7 @@ class Util
                     $new_line,
                     $query_base
                 );
-                $query_base = '$sql  = "' . $query_base . '"';
+                $query_base = '$sql  = \'' . $query_base . '"';
             } elseif ($query_too_big) {
                 $query_base = htmlspecialchars($query_base);
             } else {
@@ -1300,7 +1300,7 @@ class Util
 
             //Clean up the end of the PHP
             if (! empty($GLOBALS['show_as_php'])) {
-                $retval .= '";';
+                $retval .= '\';';
             }
             $retval .= '</div>';