mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/7888] Swap in-forum/topic search to GET forms.
This commit is contained in:
@@ -45,11 +45,11 @@
|
||||
|
||||
<!-- IF S_DISPLAY_SEARCHBOX -->
|
||||
<div class="search-box">
|
||||
<form method="post" id="forum-search" action="{S_SEARCHBOX_ACTION}">
|
||||
<form method="get" id="forum-search" action="{S_SEARCHBOX_ACTION}">
|
||||
<fieldset>
|
||||
<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" />
|
||||
<input class="button2" type="submit" value="{L_SEARCH}" />
|
||||
<input type="hidden" value="{FORUM_ID}" name="fid[]" />
|
||||
{S_SEARCH_HIDDEN_FIELDS}
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
@@ -38,12 +38,11 @@
|
||||
|
||||
<!-- IF S_DISPLAY_SEARCHBOX -->
|
||||
<div class="search-box">
|
||||
<form method="post" id="topic-search" action="{S_SEARCHBOX_ACTION}">
|
||||
<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
|
||||
<fieldset>
|
||||
<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
|
||||
<input class="button2" type="submit" value="{L_SEARCH}" />
|
||||
<input type="hidden" value="{TOPIC_ID}" name="t" />
|
||||
<input type="hidden" value="msgonly" name="sf" />
|
||||
{S_SEARCH_HIDDEN_FIELDS}
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
@@ -1 +1 @@
|
||||
<form method="post" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" /></form>
|
||||
<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_HIDDEN_FIELDS}</form>
|
||||
|
Reference in New Issue
Block a user