diff options
author | Andreas Fischer <bantu@phpbb.com> | 2011-06-09 21:57:05 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-09 21:57:05 +0200 |
commit | 905d93cceebddf2990deb45b02ce10f4a514c2d1 (patch) | |
tree | 997973900b19888fc7146bb5ee0e676ab21c6c0a /phpBB/styles | |
parent | b64159c0019615b631f6127a8c38b42d2847b9f1 (diff) | |
parent | 5b5ed96bc5097bebf3d1ec0c6af87588a53f4e05 (diff) | |
download | forums-905d93cceebddf2990deb45b02ce10f4a514c2d1.tar forums-905d93cceebddf2990deb45b02ce10f4a514c2d1.tar.gz forums-905d93cceebddf2990deb45b02ce10f4a514c2d1.tar.bz2 forums-905d93cceebddf2990deb45b02ce10f4a514c2d1.tar.xz forums-905d93cceebddf2990deb45b02ce10f4a514c2d1.zip |
Merge remote-tracking branch 'naderman/ticket/7888' into develop-olympus
* naderman/ticket/7888:
[ticket/7888] Swap in-forum/topic search to GET forms.
Diffstat (limited to 'phpBB/styles')
-rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 4 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 5 | ||||
-rw-r--r-- | phpBB/styles/subsilver2/template/searchbox.html | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index f4e80fd625..6a789074b1 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -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> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 24c57b9a7e..98e1988d10 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -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> diff --git a/phpBB/styles/subsilver2/template/searchbox.html b/phpBB/styles/subsilver2/template/searchbox.html index cb0bb5ba73..09b87a15d8 100644 --- a/phpBB/styles/subsilver2/template/searchbox.html +++ b/phpBB/styles/subsilver2/template/searchbox.html @@ -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> |