diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-11 05:48:03 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-11 05:48:03 -0500 |
| commit | 289ac72485c7684272c6958565d870fcf2f41586 (patch) | |
| tree | db1d0525e983026599008826e986a7b27638306e | |
| parent | 598e022d4ca8d9cc9631b952141c32e85d63de6e (diff) | |
| parent | e047b286d8ceea3d1621c227cfc13fbe0aa3d834 (diff) | |
| download | forums-289ac72485c7684272c6958565d870fcf2f41586.tar forums-289ac72485c7684272c6958565d870fcf2f41586.tar.gz forums-289ac72485c7684272c6958565d870fcf2f41586.tar.bz2 forums-289ac72485c7684272c6958565d870fcf2f41586.tar.xz forums-289ac72485c7684272c6958565d870fcf2f41586.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 bbd9bc4554..9913a80a70 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4632,7 +4632,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 76dcfe22a3..2d91581cf4 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -282,7 +282,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 cb6edf8423..7cb6df3660 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -567,7 +567,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]; } } |