Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -27,6 +27,7 @@ phpMyAdmin - ChangeLog
 - bug #4805 Inline edit broken when using functions in query
 - bug #4821 Timed-out import fails to restart when file represented
 - bug #4754 pMA DB not detected properly
+- bug #4825 Datepicker missing when changing number of rows on Insert page
 
 4.4.0.0 (not yet released)
 + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time

js/tbl_change.js

@@ -638,9 +638,9 @@ AJAX.registerOnload('tbl_change.js', function () {
                 curr_rows--;
             }
         }
+        // Add all the required datepickers back
+        addDateTimePicker();
     });
-    // Add all the required datepickers back
-    addDateTimePicker();
 
     /**
      * @var $function_option_dialog object holds dialog for selected function options.

libraries/display_import.lib.php

@@ -233,7 +233,13 @@ function PMA_getHtmlForImportOptionsFile($max_upload_size, $import_list)
         $html .= '            </li>';
         $html .= '            <li>';
         $html .= '               <input type="radio" name="file_location" '
-            . 'id="radio_local_import_file" />';
+            . 'id="radio_local_import_file"';
+        if (! empty($GLOBALS['timeout_passed'])
+           && ! empty($GLOBALS['local_import_file'])
+        ) {
+            $html .= ' checked="checked"';
+        }
+        $html .= ' />';
         $html .= PMA_Util::getSelectUploadFileBlock($import_list, $cfg['UploadDir']);
         $html .= '            </li>';
         $html .= '            </ul>';