Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

This commit is contained in:
Weblate 2016-12-22 15:15:55 +01:00
commit 401a18464e
2 changed files with 2 additions and 1 deletions

View File

@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog
- issue #12293 Correctly report OpenSSL errors from cookie encryption
- issue #12814 DateTime won't allow to input length in Routine editor
- issue #12841 Fixed moving of columns with whitespace in name
- issue #12847 Fixed editing of virtual columns
4.6.5.2 (2016-12-05)
- issue #12765 Fixed SQL export with newlines

View File

@ -2465,7 +2465,7 @@ class Table
* @var \SqlParser\Statements\CreateStatement $stmt
*/
$stmt = $parser->statements[0];
$fields = Table::getFields($stmt);
$fields = \SqlParser\Utils\Table::getFields($stmt);
if ($column != null) {
$expression = isset($fields[$column]['expr']) ?
substr($fields[$column]['expr'], 1, -1) : '';