diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-08-18 22:38:25 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-08-18 22:38:25 -0400 |
| commit | 97020399fa4b887ffe24b45119329a039d9e9f79 (patch) | |
| tree | 861525ed6e30976cf78e6ad45837ef44643b492e | |
| parent | cb007acc7671b6594d1f54c5279e33bacce66095 (diff) | |
| parent | 2ba1cef5b03fc7c2c44076d21426d0b5028eda27 (diff) | |
| download | forums-97020399fa4b887ffe24b45119329a039d9e9f79.tar forums-97020399fa4b887ffe24b45119329a039d9e9f79.tar.gz forums-97020399fa4b887ffe24b45119329a039d9e9f79.tar.bz2 forums-97020399fa4b887ffe24b45119329a039d9e9f79.tar.xz forums-97020399fa4b887ffe24b45119329a039d9e9f79.zip | |
Merge PR #950 branch 'dhruvgoel92/ticket/10943' into develop-olympus
* dhruvgoel92/ticket/10943:
[ticket/10943] displays searched query in search result
[ticket/10943] use keywords variable to display in search box
| -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 cd38cd615f..97bc1f9bac 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -77,6 +77,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 8cb2020630..ad9c371f63 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -603,7 +603,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 f2a4435103..0ea9d8a047 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 SEARCH_TOPIC --> |