The branch, QA_2_11 has been updated
via 20c87804372c425664211babe22ac918629acdc1 (commit)
from c1865ca7b863bd919b91313806ea47570de8347c (commit)
- Log -----------------------------------------------------------------
commit 20c87804372c425664211babe22ac918629acdc1
Author: Michal Čihař <[email protected]>
Date: Mon Aug 30 14:15:23 2010 +0200
bug #3054458 [core] Fixed displaying number of rows.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/sqlparser.lib.php | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 72d2cbc..4307e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $HeadURL:
https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
2.11.11.0 (not yet released)
- [core] Fix broken cleanup of $_GET
+- bug #3054458 [core] Fixed displaying number of rows.
2.11.10.1 (2010-08-20)
- [setup] Fixed output sanitizing in setup script, see PMASA-2010-4 for
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 753f94c..cf116a5 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -2425,7 +2425,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
--
phpMyAdmin
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
