From 4a234050f27806b98d0c8718bf9b8ebcaea9ec38 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Mon, 30 Aug 2010 14:15:23 +0200
Subject: [PATCH] bug #3054458 [core] Fixed displaying number of rows.

---
 ChangeLog                   |  1 +
 libraries/sqlparser.lib.php | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 87a4ec1582..83ee862ebb 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 f844e2301c..738d2fb88b 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>';
-- 
2.11.4.GIT