aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-02-11 05:48:03 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-02-11 05:48:03 -0500
commit289ac72485c7684272c6958565d870fcf2f41586 (patch)
treedb1d0525e983026599008826e986a7b27638306e /phpBB/viewforum.php
parent598e022d4ca8d9cc9631b952141c32e85d63de6e (diff)
parente047b286d8ceea3d1621c227cfc13fbe0aa3d834 (diff)
downloadforums-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().
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php2
1 files changed, 1 insertions, 1 deletions
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];
}
}