Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog
 - bug #4350 Deleting the DB if it is renamed by the same name
 - bug #4353 makeProfilingChart is not defined
 - bug #4355 Precision specifier for DOUBLE type is truncated
+- bug #4346 Incorrect "Export incomplete" message
 
 4.1.12.0 (2014-03-27)
 - bug #4334 Add event : datepicker won't open

export.php

@@ -27,7 +27,7 @@ if (!defined('TESTSUITE')) {
         if (isset($_SESSION['pma_export_error'])) {
             $err = $_SESSION['pma_export_error'];
             unset($_SESSION['pma_export_error']);
-            echo $err;
+            echo "timeout";
         } else {
             echo "success";
         }

js/export.js

@@ -220,6 +220,9 @@ function toggle_quick_or_custom()
 var time_out;
 function check_time_out(time_limit)
 {
+    if (typeof time_limit === 'undefined' || time_limit === 0) {
+        return true;
+    }
     //margin of one second to avoid race condition to set/access session variable
     time_limit = time_limit + 1;
     var href = "export.php";
@@ -231,7 +234,7 @@ function check_time_out(time_limit)
      clearTimeout(time_out);
      time_out = setTimeout(function(){
          $.get(href, params, function (data) {
-            if (data['message'] !== 'success') {
+            if (data['message'] === 'timeout') {
                 PMA_ajaxShowMessage(
                     '<div class="error">' +
                     PMA_messages.strTimeOutError +

libraries/display_export.lib.php

@@ -291,7 +291,15 @@ function PMA_getHtmlForExportOptionsFormat($export_list)
         __('SQL compatibility mode'), 'mysql', '50027', '14515'
     );
     global $cfg;
-    $html .= '<input type="submit" value="' . __('Go') . '" id="buttonGo" onclick="check_time_out(' . $cfg['ExecTimeLimit'] . ')"/>';
+    if ($cfg['ExecTimeLimit'] > 0) {
+        $html .= '<input type="submit" value="' . __('Go')
+            . '" id="buttonGo" onclick="check_time_out('
+            . $cfg['ExecTimeLimit'] . ')"/>';
+    } else {
+        // if the time limit set is zero, then time out won't occur
+        // So no need to check for time out.
+        $html .= '<input type="submit" value="' . __('Go') . '" id="buttonGo" />';
+    }
     $html .= '</div>';
 
     return $html;