Merge remote branch 'origin/master'
This commit is contained in:
@@ -2119,10 +2119,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
$docu = TRUE;
|
||||
break;
|
||||
} // end switch
|
||||
// inner_sql is a span that exists for all cases
|
||||
// inner_sql is a span that exists for all cases, except query_only
|
||||
// of $cfg['SQP']['fmtType'] to make possible a replacement
|
||||
// for inline editing
|
||||
$str .= '<span class="inner_sql">';
|
||||
if ($mode!='query_only') {
|
||||
$str .= '<span class="inner_sql">';
|
||||
}
|
||||
$close_docu_link = false;
|
||||
$indent = 0;
|
||||
$bracketlevel = 0;
|
||||
@@ -2617,8 +2619,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
$str .= '</a>';
|
||||
$close_docu_link = false;
|
||||
}
|
||||
// close inner_sql span
|
||||
$str .= '</span>';
|
||||
if ($mode!='query_only') {
|
||||
// close inner_sql span
|
||||
$str .= '</span>';
|
||||
}
|
||||
if ($mode=='color') {
|
||||
// close syntax span
|
||||
$str .= '</span>';
|
||||
|
Reference in New Issue
Block a user