Merge branch 'QA_4_5'

2015-10-05 18:19:34 -04:00 · 2015-10-05 18:19:34 -04:00 · be17cf15cb
commit be17cf15cb
parent ad7d40c59e ed8ba7b3d7
2 changed files with 3 additions and 0 deletions
--- a/1
+++ b/1
@ -33,6 +33,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
--- a/libraries/controllers/TableStructureController.class.php
+++ b/libraries/controllers/TableStructureController.class.php
@ -996,6 +996,8 @@ class TableStructureController extends TableController
                            $_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}", '')
                        );
                    }