Merge branch 'QA_4_6'

phpmyadmin · Apr 5, 2016 · c3afee6 · c3afee6
2 parents d0c6d18 + 1580d2f
commit c3afee6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 - issue #12132 Can not open table with JSON field
 - issue #12125 Cannot highlight a column if I scroll down from the top of the table
 - issue #12154 Fixed possible PHP error in SQL parser
+- issue #12029 Fixed SQL quoting in SQL export
 
 4.6.0.0 (2016-03-22)
 + issue #11456 Disabled storage engines

diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php
@@ -1556,7 +1556,7 @@ public function getTableDef(
                 if (empty($sql_backquotes)) {
                     // Option "Enclose table and column names with backquotes"
                     // was checked.
-                    SqlParser\Context::$MODE |= SqlParser\Context::NO_ENCLOSING_QUOTES;
+                    Context::$MODE |= Context::NO_ENCLOSING_QUOTES;
                 }
 
                 // Using appropriate quotes.