Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
This commit is contained in:
commit
36ad9371ee
@ -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"
|
||||
|
||||
@ -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,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user