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

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-02-17 11:37:35 +01:00
commit cd0e1000a8
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/Util.php
View File

@ -1092,18 +1092,18 @@ class Util
}
}
$render_sql = $cfg['ShowSQL'] == true && ! empty($sql_query) && $sql_query !== ';';
if (isset($GLOBALS['using_bookmark_message'])) {
$retval .= $GLOBALS['using_bookmark_message']->getDisplay();
unset($GLOBALS['using_bookmark_message']);
}
// In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence,
// check for it's presence before using it
$retval .= '<div class="result_query"'
. ( isset($GLOBALS['cell_align_left'])
? ' style="text-align: ' . $GLOBALS['cell_align_left'] . '"'
: '' )
. '>' . "\n";
if ($render_sql) {
$retval .= '<div class="result_query"'
. ' style="text-align: ' . $GLOBALS['cell_align_left'] . '"'
. '>' . "\n";
}
if ($message instanceof Message) {
if (isset($GLOBALS['special_message'])) {
@ -1121,7 +1121,7 @@ class Util
$retval .= '</div>';
}
if ($cfg['ShowSQL'] == true && ! empty($sql_query) && $sql_query !== ';') {
if ($render_sql) {
// Html format the query to be displayed
// If we want to show some sql code it is easiest to create it here
/* SQL-Parser-Analyzer */
@ -1342,9 +1342,10 @@ class Util
$retval .= $inline_edit_link . $edit_link . $explain_link . $php_link
. $refresh_link;
$retval .= '</div>';
$retval .= '</div>';
}
$retval .= '</div>';
return $retval;
} // end of the 'getMessage()' function