nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Marc Delisle
2010-03-14 08:48:11 -04:00
parent 87dd6b3cee b686640a06
commit a3bbb9aada
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -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

6
libraries/display_tbl.lib.php
View File

@@ -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'])) {