[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9296-gfdb0d32

The branch, master has been updated via fdb0d32df4008633cc39a6846211a14611711d25 (commit) via 4a234050f27806b98d0c8718bf9b8ebcaea9ec38 (commit) from 411844233d9a82c52d60c0fffcf53ba455e5bf3c (commit) - Log ----------------------------------------------------------------- commit fdb0d32df4008633cc39a6846211a14611711d25 Merge: 411844233d9a82c52d60c0fffcf53ba455e5bf3c 4a234050f27806b98d0c8718bf9b8ebcaea9ec38 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Aug 30 14:18:02 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/sqlparser.lib.php | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 944449a..3613acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ $Id$ 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 463b73a..d8967d9 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2574,7 +2574,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 /* End possibly unclosed documentation link */ if ($close_docu_link) { hooks/post-receive -- phpMyAdmin