diff --git a/js/ajax.js b/js/ajax.js index a5a70f91a7..13e388a58c 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -446,10 +446,12 @@ var AJAX = { .insertAfter('#selflink') .append(data._errors); // bind for php error reporting forms (bottom) - $("#pma_ignore_errors_bottom").bind("click", function() { + $("#pma_ignore_errors_bottom").bind("click", function(e) { + e.preventDefault(); PMA_ignorePhpErrors(); }); - $("#pma_ignore_all_errors_bottom").bind("click", function() { + $("#pma_ignore_all_errors_bottom").bind("click", function(e) { + e.preventDefault(); PMA_ignorePhpErrors(false); }); // In case of 'sendErrorReport'='always' diff --git a/js/messages.php b/js/messages.php index d43376ebc3..917e6d6650 100644 --- a/js/messages.php +++ b/js/messages.php @@ -572,14 +572,15 @@ $js_messages['strTooManyInputs'] = __( $js_messages['phpErrorsFound'] = '
' . __('Some errors have been detected on the server!') - . '
' + . '
' . __('Please look at the bottom of this window.') + . '
' . '' + . '" class="floatright" style="margin-top: 20px;">' . '' + . '" class="floatright" style="margin-top: 20px;">' . '
'; $js_messages['phpErrorsBeingSubmitted'] = '
' diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 3a4c028b4e..d8518a2d7a 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -331,25 +331,23 @@ class PMA_Error_Handler . '' . '' + . '" id="pma_report_errors" class="floatright">' . '' . '' - . ''; + . ''; if ($GLOBALS['cfg']['SendErrorReports'] == 'ask') { // add ignore buttons $retval .= ''; + . '" id="pma_ignore_errors_bottom" class="floatright">'; } $retval .= ''; + . '" id="pma_ignore_all_errors_bottom" class="floatright">'; + $retval .= ''; } return $retval; } @@ -537,11 +535,13 @@ class PMA_Error_Handler function() { PMA_ignorePhpErrors(false) });' - . '$("#pma_ignore_errors_bottom").bind("click", function() { + . '$("#pma_ignore_errors_bottom").bind("click", function(e) { + e.preventDefaulut(); PMA_ignorePhpErrors() });' . '$("#pma_ignore_all_errors_bottom").bind("click", - function() { + function(e) { + e.preventDefault(); PMA_ignorePhpErrors(false) });' . '$("html, body").animate({