From c83457fb8a2ed9fc54dfd10193bd97bacab255e3 Mon Sep 17 00:00:00 2001 From: Dhananjay Nakrani Date: Sat, 7 Jun 2014 21:15:53 +0530 Subject: [PATCH] Display appropriate msg while automatically submitting php error report. Signed-off-by: Dhananjay Nakrani --- js/ajax.js | 1 + js/messages.php | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/js/ajax.js b/js/ajax.js index 0afc9de03f..4a016739d2 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -403,6 +403,7 @@ var AJAX = { && data._stopErrorReportLoop != '1' ) { $("#pma_report_errors_form").submit(); + PMA_ajaxShowMessage(PMA_messages['phpErrorsBeingSubmitted'], false); } else if (data._promptPhpErrors) { // otherwise just prompt user if it is set so. msg = msg + PMA_messages['phpErrorsFound']; diff --git a/js/messages.php b/js/messages.php index 1d284696bc..9fd159726c 100644 --- a/js/messages.php +++ b/js/messages.php @@ -438,6 +438,13 @@ $js_messages['phpErrorsFound'] = '
' . '" onclick="PMA_ignorePhpErrors(false)" style="float: right; margin: 20px;">' . '
'; +$js_messages['phpErrorsBeingSubmitted'] = '
' + . __('Some errors have been detected on the server!!') + . '
' + . __('As per your settings, they are being submitted currently.') + . __(' Please be patient.') + . '
'; + echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);