[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-221-ga3bbb9a

[Marc Delisle]

The branch, master has been updated
       via  a3bbb9aadae0497d796067d40d1ae9de72973a7f (commit)
       via  b686640a06916ddc65bc46f5a057990914ac091a (commit)
      from  87dd6b3ceeca9ed8e3feba529c9b4302eaf32b0b (commit)


- Log -----------------------------------------------------------------
commit a3bbb9aadae0497d796067d40d1ae9de72973a7f
Merge: 87dd6b3ceeca9ed8e3feba529c9b4302eaf32b0b b686640a06916ddc65bc46f5a057990914ac091a
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Mar 14 08:48:11 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |    1 +
 libraries/display_tbl.lib.php |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24103f8..f71bb44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 3.3.2.0 (not yet released)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
   MySQL version, thanks to Dieter Adriaenssens - ruleant
+- bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing
 
 3.3.1.0 (not yet released)
 - bug #2941037 [core] Database structure not sorted by table correctly 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 1656964..602ed95 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1674,7 +1674,11 @@ function PMA_displayTable_checkConfigParams()
         $_SESSION['tmp_user_values']['query'][$sql_key]['repeat_cells'] = $GLOBALS['cfg']['RepeatCells'];
     }
 
-    if (PMA_isValid($_REQUEST['session_max_rows'], 'numeric') || $_REQUEST['session_max_rows'] == 'all') {
+    // as this is a form value, the type is always string so we cannot
+    // use PMA_isValid($_REQUEST['session_max_rows'], 'integer')
+    if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric') 
+        && (int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows']) 
+        || $_REQUEST['session_max_rows'] == 'all') {
         $_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'] = $_REQUEST['session_max_rows'];
         unset($_REQUEST['session_max_rows']);
     } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'])) {


hooks/post-receive
-- 
phpMyAdmin