diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-09 21:59:52 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-09 21:59:52 +0200 |
| commit | d2f7782b75a327bf1b29edc6cebe3c2e004851f6 (patch) | |
| tree | 23cba571849f70c663938b0ed0b7b13bb9885d5f /phpBB/viewtopic.php | |
| parent | ba5c9cf023d1148d3b434e6bd088bcda19902bc8 (diff) | |
| parent | 905d93cceebddf2990deb45b02ce10f4a514c2d1 (diff) | |
| download | forums-d2f7782b75a327bf1b29edc6cebe3c2e004851f6.tar forums-d2f7782b75a327bf1b29edc6cebe3c2e004851f6.tar.gz forums-d2f7782b75a327bf1b29edc6cebe3c2e004851f6.tar.bz2 forums-d2f7782b75a327bf1b29edc6cebe3c2e004851f6.tar.xz forums-d2f7782b75a327bf1b29edc6cebe3c2e004851f6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/7888] Swap in-forum/topic search to GET forms.
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 53119e2ae7..d80659416f 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -546,6 +546,15 @@ $server_path = (!$view) ? $phpbb_root_path : generate_board_url() . '/'; // Replace naughty words in title $topic_data['topic_title'] = censor_text($topic_data['topic_title']); +$s_search_hidden_fields = array( + 't' => $topic_id, + 'sf' => 'msgonly', +); +if ($_SID) +{ + $s_search_hidden_fields['sid'] = $_SID; +} + // Send vars to template $template->assign_vars(array( 'FORUM_ID' => $forum_id, @@ -597,7 +606,8 @@ $template->assign_vars(array( 'S_VIEWTOPIC' => true, 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, - 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 't=' . $topic_id), + 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx"), + 'S_SEARCH_HIDDEN_FIELDS' => build_hidden_fields($s_search_hidden_fields), 'S_DISPLAY_POST_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false, 'S_DISPLAY_REPLY_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false, |