diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-11 05:47:52 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-11 05:47:52 -0500 |
| commit | e047b286d8ceea3d1621c227cfc13fbe0aa3d834 (patch) | |
| tree | d64d4c7f6c71070744dcdfb12f9942546a9fbeae | |
| parent | ed6bd50ab868d26fae45fbac2fbe907a6abf58c9 (diff) | |
| parent | a962e788542dac43a365afde295babf3ee681535 (diff) | |
| download | forums-e047b286d8ceea3d1621c227cfc13fbe0aa3d834.tar forums-e047b286d8ceea3d1621c227cfc13fbe0aa3d834.tar.gz forums-e047b286d8ceea3d1621c227cfc13fbe0aa3d834.tar.bz2 forums-e047b286d8ceea3d1621c227cfc13fbe0aa3d834.tar.xz forums-e047b286d8ceea3d1621c227cfc13fbe0aa3d834.zip | |
Merge remote-tracking branch 'bantu/ticket/10606' into develop-olympus
* bantu/ticket/10606:
[ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
[ticket/10606] Fix incorrect hidden fields array name in page_header().
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4d2a00f2db..0320230a7d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4553,7 +4553,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 foreach ($_EXTRA_URL as $url_param) { $url_param = explode('=', $url_param, 2); - $s_hidden_fields[$url_param[0]] = $url_param[1]; + $s_search_hidden_fields[$url_param[0]] = $url_param[1]; } } diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 588f60b589..6fec662b02 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -278,7 +278,7 @@ 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]; + $s_search_hidden_fields[$url_param[0]] = $url_param[1]; } } diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 01cd6a28a8..74420a25c7 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -607,7 +607,7 @@ 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]; + $s_search_hidden_fields[$url_param[0]] = $url_param[1]; } } |