The branch, master has been updated via 5d147c25affd72bba06b86d131c272bceb361f4d (commit) from e083d8438afe74c8568c922e943f09e161435d40 (commit)

- Log ----------------------------------------------------------------- commit 5d147c25affd72bba06b86d131c272bceb361f4d Author: Marc Delisle marc@infomarc.info Date: Sun Apr 10 09:01:31 2011 -0400

Bug #3281316 Loading message stays on screen for too long

-----------------------------------------------------------------------

Summary of changes: js/sql.js | 16 +++++++++------- sql.php | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/js/sql.js b/js/sql.js index 6895b16..1444b15 100644 --- a/js/sql.js +++ b/js/sql.js @@ -264,13 +264,15 @@ $(document).ready(function() { $('.success').fadeOut(); $('.sqlquery_message').fadeOut(); // show a message that stays on screen - $('#sqlqueryform').before(data.message); - // and display the query - $('<div class="sqlquery_message"></div>') - .html(data.sql_query) - .insertBefore('#sqlqueryform'); - // unnecessary div that came from data.sql_query - $('.notice').remove(); + if (typeof data.sql_query != 'undefined') { + $('<div class="sqlquery_message"></div>') + .html(data.sql_query) + .insertBefore('#sqlqueryform'); + // unnecessary div that came from data.sql_query + $('.notice').remove(); + } else { + $('#sqlqueryform').before(data.message); + } $('#sqlqueryresults').show(); // this happens if a USE command was typed if (typeof data.reload != 'undefined') { diff --git a/sql.php b/sql.php index eb6dc52..ce2f65f 100644 --- a/sql.php +++ b/sql.php @@ -710,7 +710,7 @@ if (0 == $num_rows || $is_affected) { }

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) { $extra_data['reload'] = 1;

hooks/post-receive