Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michal Čihař 2012-06-30 21:00:26 +02:00
commit 0953df2fe4

View File

@ -371,7 +371,7 @@ if ($response->isAjax()) {
exit;
}
if (isset($return_to_sql_query)) {
if (! empty($return_to_sql_query)) {
$disp_query = $GLOBALS['sql_query'];
$disp_message = $message;
unset($message);