diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-12-09 01:32:21 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-12-09 01:32:21 +0100 |
| commit | 2c7495e1c7216b9a64669c6b1c976ed3a0a4b049 (patch) | |
| tree | dadf5ca954b81e822da767b1316c29b5c1194ace /phpBB/includes | |
| parent | 7ae12df3d2c6850da12837a6d86875e3b3981177 (diff) | |
| parent | 57ba746f51a3557022fbe99ae36dabf14d5d0e20 (diff) | |
| download | forums-2c7495e1c7216b9a64669c6b1c976ed3a0a4b049.tar forums-2c7495e1c7216b9a64669c6b1c976ed3a0a4b049.tar.gz forums-2c7495e1c7216b9a64669c6b1c976ed3a0a4b049.tar.bz2 forums-2c7495e1c7216b9a64669c6b1c976ed3a0a4b049.tar.xz forums-2c7495e1c7216b9a64669c6b1c976ed3a0a4b049.zip | |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[ticket/10319] Missing hidden fields in search form
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7ce83b871a..01b3ca92a9 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4378,7 +4378,7 @@ function phpbb_http_login($param) */ function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum') { - global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path; + global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path; if (defined('HEADER_INC')) { @@ -4531,6 +4531,15 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 $s_search_hidden_fields['sid'] = $_SID; } + if (!empty($_EXTRA_URL)) + { + foreach ($_EXTRA_URL as $url_param) + { + $url_param = explode('=', $url_param, 2); + $s_hidden_fields[$url_param[0]] = $url_param[1]; + } + } + // The following assigns all _common_ variables that may be used at any point in a template. $template->assign_vars(array( 'SITENAME' => $config['sitename'], |