Merge branch 'QA_4_8'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Mar 19, 2019 · e575d4a · e575d4a
2 parents 1f7e7ce + 75eb905
commit e575d4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog
 - issue        Show error message if config-set fails and not "loading..." forever
 - issue #14359 Prevent multiple error modals, and error-report request spamming from script
 - issue        Fixed error reporting javascript errors on multi server setup
+- issue        Fixed wrong property name on TableStructureController
 
 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log

diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
@@ -437,7 +437,7 @@ protected function moveColumns()
             $data['Expression'] = '';
             if (isset($data['Extra']) && in_array($data['Extra'], $virtual)) {
                 $data['Virtuality'] = str_replace(' GENERATED', '', $data['Extra']);
-                $expressions = $this->table->getColumnGenerationExpression($column);
+                $expressions = $this->table_obj->getColumnGenerationExpression($column);
                 $data['Expression'] = $expressions[$column];
             }