diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-07 21:30:42 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-07 21:30:42 -0400 |
| commit | 576cd6dd1e45171e998d6aa13ab74b73939ce084 (patch) | |
| tree | 838541d0270ef654f0cbf504145c2dde2cad4a7c /phpBB | |
| parent | b6a364b706a6d79b2d1a2854ea4fe2dba576dba2 (diff) | |
| parent | b98be2f23543a25b74dc8442338d0db4fcc3403b (diff) | |
| download | forums-576cd6dd1e45171e998d6aa13ab74b73939ce084.tar forums-576cd6dd1e45171e998d6aa13ab74b73939ce084.tar.gz forums-576cd6dd1e45171e998d6aa13ab74b73939ce084.tar.bz2 forums-576cd6dd1e45171e998d6aa13ab74b73939ce084.tar.xz forums-576cd6dd1e45171e998d6aa13ab74b73939ce084.zip | |
Merge PR #854 branch 'dhruvgoel92/ticket/10943' into develop
* dhruvgoel92/ticket/10943:
[ticket/10943] displays searched query in search result
[ticket/10943] use keywords variable to display in search box
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/search.php | 1 | ||||
| -rw-r--r-- | phpBB/search.php | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index 2fbb5122ad..d09b4303cd 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -82,6 +82,7 @@ $lang = array_merge($lang, array( 'SEARCHED_FOR' => 'Search term used', 'SEARCHED_TOPIC' => 'Searched topic', + 'SEARCHED_QUERY' => 'Searched query', 'SEARCH_ALL_TERMS' => 'Search for all terms or use query as entered', 'SEARCH_ANY_TERMS' => 'Search for any terms', 'SEARCH_AUTHOR' => 'Search for author', diff --git a/phpBB/search.php b/phpBB/search.php index 1123d7c5b9..93cd0c31fd 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -606,7 +606,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) $template->assign_vars(array( 'SEARCH_TITLE' => $l_search_title, 'SEARCH_MATCHES' => $l_search_matches, - 'SEARCH_WORDS' => $search->search_query, + 'SEARCH_WORDS' => $keywords, + 'SEARCHED_QUERY' => $search->search_query, 'IGNORED_WORDS' => (sizeof($search->common_words)) ? implode(' ', $search->common_words) : '', 'PAGINATION' => generate_pagination($u_search, $total_match_count, $per_page, $start), 'PAGE_NUMBER' => on_page($total_match_count, $per_page, $start), diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 56712db75a..0a58605b31 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -1,6 +1,7 @@ <!-- INCLUDE overall_header.html --> <h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> +<!-- IF SEARCHED_QUERY --> <p>{L_SEARCHED_QUERY}: <strong>{SEARCHED_QUERY}</strong></p><!-- ENDIF --> <!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}: <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF --> <!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF --> |