Merge remote-tracking branch 'origin/master'

2014-01-09 14:17:52 +01:00 · 2014-01-09 14:17:52 +01:00 · 9ec09ffccb
commit 9ec09ffccb
parent fe688affbd 26702fc489
2 changed files with 3 additions and 2 deletions
--- a/1
+++ b/1
@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
 - bug #3780 Allow aborting loading pages
 - bug #4223 Database list: Create database misses collation column
 - bug #4224 Empty table names when a table is "inuse"
+- bug #4225 Partition maintenance broken

 4.1.4.0 (2014-01-07)
 - bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@ -1339,8 +1339,8 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)

    $html_output .= '</fieldset>'
        . '<fieldset class="tblFooters">'
-        . '<input type="submit" name="submit_partition" '
-        . 'value="' . __('Go') . '" />'
+        . '<input type="hidden" name="submit_partition" value="1">'
+        . '<input type="submit" value="' . __('Go') . '" />'
        . '</fieldset>'
        . '</form>'
        . '</div>';