webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity

Serve both ajax and non-ajax scenarios

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne
2014-11-27 15:06:14 +05:30
parent 6fb9a53b4a
commit dfd10b34fe
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/sql.lib.php
View File

@@ -1572,17 +1572,22 @@ function PMA_getQueryResponseForNoResultsReturned($analyzed_sql_results, $db,
$html_output = '';
if (!isset($GLOBALS['show_as_php'])) {
if ($GLOBALS['cfg']['ShowSQL']) {
$html_output .= PMA_Util::getMessage(
$message, $GLOBALS['sql_query'], 'success'
);
}
$response = PMA_Response::getInstance();
if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) {
$extra_data['reload'] = 1;
$extra_data['db'] = $GLOBALS['db'];
}
$GLOBALS['message'] = $message;
if (empty($_REQUEST['ajax_page_request'])) {
$extra_data['message'] = $message;
if ($GLOBALS['cfg']['ShowSQL']) {
$extra_data['sql_query'] = PMA_Util::getMessage(
$message, $GLOBALS['sql_query'], 'success'
);
}
}
$response = PMA_Response::getInstance();
$response->addJSON(isset($extra_data) ? $extra_data : array());
$query_type = PMA_DisplayResults::QUERY_TYPE_SELECT;