The branch, QA_3_3 has been updated via 4a234050f27806b98d0c8718bf9b8ebcaea9ec38 (commit) from 1052956cc908936cc0f301a9f47bd7a2a1aaaed8 (commit)
- Log ----------------------------------------------------------------- -----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/sqlparser.lib.php | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 87a4ec1..83ee862 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.7.0 (not yet released) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after 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) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index f844e23..738d2fb 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2456,7 +2456,15 @@ if (! defined('PMA_MINIMUM_COMMON')) { } $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 if ($mode=='color') { $str .= '</span>';
hooks/post-receive