mirror of
https://github.com/phpbb/phpbb.git
synced 2025-01-18 22:58:10 +01:00
Merge pull request #5940 from mrgoldy/ticket/16434
[ticket/16434] Add forum id to advanced search in viewforum
This commit is contained in:
commit
1169e1915d
@ -58,7 +58,7 @@
|
||||
<button class="button button-search" type="submit" title="{L_SEARCH}">
|
||||
<i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span>
|
||||
</button>
|
||||
<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
|
||||
<a href="{{ U_SEARCH_FORUM }}" class="button button-search-end" title="{L_SEARCH_ADV}">
|
||||
<i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span>
|
||||
</a>
|
||||
{S_SEARCH_LOCAL_HIDDEN_FIELDS}
|
||||
|
@ -433,6 +433,7 @@ $template->assign_vars(array(
|
||||
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($start == 0) ? '' : "&start=$start")),
|
||||
'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewforum.$phpEx", "f=$forum_id" . (($start) ? "&start=$start" : ''), true, ''),
|
||||
'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&f=$forum_id&mark=topics&mark_time=" . time()) : '',
|
||||
'U_SEARCH_FORUM' => append_sid("{$phpbb_root_path}search.$phpEx", 'fid%5B%5D=' . $forum_id),
|
||||
));
|
||||
|
||||
// Grab icons
|
||||
|
Loading…
x
Reference in New Issue
Block a user