diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-12-09 01:32:29 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-12-09 01:32:29 +0100 |
| commit | 94d954281eee7effb288ff35e4daada5bc5d938c (patch) | |
| tree | fa915b055eb56139ebbaa389ba9fbcaaf5e9ac34 | |
| parent | f4f82ac5bd6121d5fcf008b939723fd2df9b061c (diff) | |
| parent | 2c7495e1c7216b9a64669c6b1c976ed3a0a4b049 (diff) | |
| download | forums-94d954281eee7effb288ff35e4daada5bc5d938c.tar forums-94d954281eee7effb288ff35e4daada5bc5d938c.tar.gz forums-94d954281eee7effb288ff35e4daada5bc5d938c.tar.bz2 forums-94d954281eee7effb288ff35e4daada5bc5d938c.tar.xz forums-94d954281eee7effb288ff35e4daada5bc5d938c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10319] Missing hidden fields in search form
| -rw-r--r-- | phpBB/includes/functions.php | 11 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 9 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 9 |
3 files changed, 28 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index cdb69e605f..86bd21b1fc 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4461,7 +4461,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')) { @@ -4611,6 +4611,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'], diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 7d3b9f56ed..2d235b734d 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -278,6 +278,15 @@ if ($_SID) $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]; + } +} + $template->assign_vars(array( 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '', diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index a56012bcf2..e441ac49b0 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -563,6 +563,15 @@ if ($_SID) $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]; + } +} + // Send vars to template $template->assign_vars(array( 'FORUM_ID' => $forum_id, |