From 34e12cf77ef2aec6ce22f98889d2a5fd5588570b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 29 May 2013 09:47:55 -0400 Subject: [PATCH] bug #3956 "Browse foreign values" search filter / page selector not working --- ChangeLog | 1 + browse_foreigners.php | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9483873d88..b3ade7e50e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #3942 Warnings about reserved word for many non reserved words - bug #3912 Exporting row selection, resulted by ORDER BY query - bug #3957 Cookies must be enabled past this point +- bug #3956 "Browse foreign values" search filter / page selector not working 4.0.2.0 (2013-05-24) - bug #3902 Cannot browse when table name contains keyword "call" diff --git a/browse_foreigners.php b/browse_foreigners.php index 8cdc7728b0..9a9fdf9043 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -9,7 +9,22 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/transformations.lib.php'; -$field = $_REQUEST['field']; +/** + * Sets globals from $_REQUEST + */ +$request_params = array( + 'field', + 'fieldkey', + 'foreign_filter', + 'pos', + 'rownumber' +); + +foreach ($request_params as $one_request_param) { + if (isset($_REQUEST[$one_request_param])) { + $GLOBALS[$one_request_param] = $_REQUEST[$one_request_param]; + } +} PMA_Util::checkParameters(array('db', 'table', 'field')); @@ -66,6 +81,7 @@ if (is_array($foreignData['disp_row'])) { if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) { $gotopage = PMA_Util::pageselector( + 'pos', $session_max_rows, $pageNow, $nbTotalPage,