gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display appropriate msg while automatically submitting php error report.

Browse Source 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
This commit is contained in:
Dhananjay Nakrani 2014-06-07 21:15:53 +05:30
parent 0b9439a246
commit c83457fb8a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/ajax.js
View File

@ -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'];

7
js/messages.php
View File

@ -438,6 +438,13 @@ $js_messages['phpErrorsFound'] = '<div class="error">'
. '" onclick="PMA_ignorePhpErrors(false)" style="float: right; margin: 20px;">'
. '</div></div>';
$js_messages['phpErrorsBeingSubmitted'] = '<div class="error">'
. __('Some errors have been detected on the server!!')
. '<br/>'
. __('As per your settings, they are being submitted currently.')
. __(' Please be patient.')
. '</div>';
echo "var PMA_messages = new Array();\n";
foreach ($js_messages as $name => $js_message) {
PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);