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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2011-04-10 16:40:09 +02:00
parent 7aead6373e 5d147c25af
commit 4b65d15b80
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/sql.js
View File

@@ -264,13 +264,15 @@ $(document).ready(function() {
$('.success').fadeOut(); $('.success').fadeOut();
$('.sqlquery_message').fadeOut(); $('.sqlquery_message').fadeOut();
// show a message that stays on screen // show a message that stays on screen
$('#sqlqueryform').before(data.message); if (typeof data.sql_query != 'undefined') {
// and display the query $('<div class="sqlquery_message"></div>')
$('<div class="sqlquery_message"></div>') .html(data.sql_query)
.html(data.sql_query) .insertBefore('#sqlqueryform');
.insertBefore('#sqlqueryform'); // unnecessary div that came from data.sql_query
// unnecessary div that came from data.sql_query $('.notice').remove();
$('.notice').remove(); } else {
$('#sqlqueryform').before(data.message);
}
$('#sqlqueryresults').show(); $('#sqlqueryresults').show();
// this happens if a USE command was typed // this happens if a USE command was typed
if (typeof data.reload != 'undefined') { if (typeof data.reload != 'undefined') {

2
sql.php
View File

@@ -710,7 +710,7 @@ if (0 == $num_rows || $is_affected) {
} }
if ($cfg['ShowSQL']) { if ($cfg['ShowSQL']) {
$extra_data['result_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success'); $extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
} }
if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) { if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) {
$extra_data['reload'] = 1; $extra_data['reload'] = 1;