Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5

phpmyadmin · Oct 6, 2015 · ea68442 · ea68442
2 parents a56aaad + 13aff1c
commit ea68442
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 207 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
 - issue #11519 Bug while exporting results when a joined table field name is in SELECT query
 - issue #11522 Strange behavior on table rename
 - issue #11539 Rename table does not result in refresh in left panel
+- issue #11541 Missing arguments for PMA_Table::generateAlter()
 
 4.5.0.2 (2015-09-25)
 - issue #11497 Incorrect indexes when exporting

diff --git a/libraries/controllers/TableStructureController.class.php b/libraries/controllers/TableStructureController.class.php
@@ -766,6 +766,8 @@ protected function updateColumns()
                             $_REQUEST['field_default_value_orig'][$i],
                             Util\get($_REQUEST, "field_extra_orig.${i}", false),
                             Util\get($_REQUEST, "field_comments_orig.${i}", ''),
+                            Util\get($_REQUEST, "field_virtuality_orig.${i}", ''),
+                            Util\get($_REQUEST, "field_expression_orig.${i}", ''),
                             Util\get($_REQUEST, "field_move_to_orig.${i}", '')
                         );
                     }