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

Avoid displaying a Back link in a error message if we are in Ajax mode

Browse Source
This commit is contained in:
Marc Delisle
2011-03-23 08:10:22 -04:00
parent 701a668d35
commit 29dbdde4ff
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/common.lib.php
View File

@@ -661,6 +661,14 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
$_SESSION['Import_message']['message'] = $error_msg_output; $_SESSION['Import_message']['message'] = $error_msg_output;
if ($exit) { if ($exit) {
/**
* If in an Ajax request
* - avoid displaying a Back link
* - use PMA_ajaxResponse() to transmit the message and exit
*/
if($GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($error_msg_output, false);
}
if (! empty($back_url)) { if (! empty($back_url)) {
if (strstr($back_url, '?')) { if (strstr($back_url, '?')) {
$back_url .= '&no_history=true'; $back_url .= '&no_history=true';
@@ -675,16 +683,10 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
$error_msg_output .= '</fieldset>' . "\n\n"; $error_msg_output .= '</fieldset>' . "\n\n";
} }
/** echo $error_msg_output;
* If in an Ajax request, don't just echo and exit. Use PMA_ajaxResponse() /**
*/ * display footer and exit
if($GLOBALS['is_ajax_request'] == true) { */
PMA_ajaxResponse($error_msg_output, false);
}
echo $error_msg_output;
/**
* display footer and exit
*/
require './libraries/footer.inc.php'; require './libraries/footer.inc.php';
} else { } else {
echo $error_msg_output; echo $error_msg_output;