Merge branch 'QA_4_7'

This commit is contained in:
Michal Čihař 2017-06-06 16:46:22 +02:00
commit 2a7fe79890
2 changed files with 2 additions and 2 deletions

View File

@ -37,7 +37,7 @@
"ext-xml": "*",
"ext-pcre": "*",
"ext-json": "*",
"phpmyadmin/sql-parser": "^4.1.2",
"phpmyadmin/sql-parser": "^4.1.7",
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"phpseclib/phpseclib": "^2.0",

View File

@ -1576,7 +1576,7 @@ class ExportSql extends ExportPlugin
// Using appropriate quotes.
if (($compat === 'MSSQL') || ($sql_backquotes === '"')) {
Context::$MODE |= Context::ANSI_QUOTES;
Context::$MODE |= Context::SQL_MODE_ANSI_QUOTES;
}
}