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

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Michal Čihař
2010-08-30 14:18:02 +02:00
parent 411844233d 4a234050f2
commit fdb0d32df4
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -116,6 +116,7 @@ $Id$
3.3.7.0 (not yet released) 3.3.7.0 (not yet released)
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
a page size increase, thanks to Martin Schönberger - mad05 a page size increase, thanks to Martin Schönberger - mad05
- bug #3054458 [core] Fixed displaying number of rows.
3.3.6.0 (2010-08-28) 3.3.6.0 (2010-08-28)
- bug #3033063 [core] Navi gets wrong db name - bug #3033063 [core] Navi gets wrong db name

10
libraries/sqlparser.lib.php
View File

@@ -2574,7 +2574,15 @@ if (! defined('PMA_MINIMUM_COMMON')) {
} }
$after .= "\n"; $after .= "\n";
*/ */
$str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : htmlspecialchars($arr[$i]['data'])). $after; $str .= $before;
if ($mode=='color') {
$str .= PMA_SQP_formatHTML_colorize($arr[$i]);
} elseif ($mode == 'text') {
$str .= htmlspecialchars($arr[$i]['data']);
} else {
$str .= $arr[$i]['data'];
}
$str .= $after;
} // end for } // end for
/* End possibly unclosed documentation link */ /* End possibly unclosed documentation link */
if ($close_docu_link) { if ($close_docu_link) {