From 1094de49c2eb693517bcdb57fcb4e6f9c2155bda Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Sat, 6 Sep 2014 14:53:14 +0200 Subject: [PATCH 1/3] [ticket/13022] Condition Return to advanced search link PHPBB3-13022 --- phpBB/search.php | 1 + phpBB/styles/prosilver/template/search_results.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index 67f6f4dbb5..3cf8cf176b 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -602,6 +602,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'PHRASE_SEARCH_DISABLED' => $phrase_search_disabled, + 'REFERER_IS_SEARCH' => (strpos($user->referer, "search.$phpEx") !== false) ? true : false, 'TOTAL_MATCHES' => $total_match_count, 'SEARCH_IN_RESULTS' => ($search_id) ? false : true, diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 47aa8d85de..6ee5be3b8f 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -7,7 +7,7 @@

{L_RETURN_TO_TOPIC}

- +

{L_RETURN_TO_SEARCH_ADV}

From dfbc2adc089818fba1c08d87c7fb491e2a2a04b6 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Sun, 7 Sep 2014 22:39:22 +0200 Subject: [PATCH 2/3] [ticket/13022] Remove ternary condition PHPBB3-13022 --- phpBB/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index 3cf8cf176b..13f20fb72d 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -602,7 +602,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'PHRASE_SEARCH_DISABLED' => $phrase_search_disabled, - 'REFERER_IS_SEARCH' => (strpos($user->referer, "search.$phpEx") !== false) ? true : false, + 'REFERER_IS_SEARCH' => strpos($user->referer, "search.$phpEx") !== false, 'TOTAL_MATCHES' => $total_match_count, 'SEARCH_IN_RESULTS' => ($search_id) ? false : true, From 4b4a673d98a6708f98b111ec8c30f66b1d8a0e41 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 8 Sep 2014 23:14:33 +0200 Subject: [PATCH 3/3] [ticket/13022] Language adjustments PHPBB3-13022 --- phpBB/language/en/search.php | 2 +- phpBB/search.php | 1 - phpBB/styles/prosilver/template/jumpbox.html | 2 +- phpBB/styles/prosilver/template/message_body.html | 2 +- phpBB/styles/prosilver/template/search_results.html | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index 7d5b400f82..ec5dd99eb8 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -86,7 +86,7 @@ $lang = array_merge($lang, array( 'RESULT_DAYS' => 'Limit results to previous', 'RESULT_SORT' => 'Sort results by', 'RETURN_FIRST' => 'Return first', - 'RETURN_TO_SEARCH_ADV' => 'Return to advanced search', + 'GO_TO_SEARCH_ADV' => 'Go to advanced search', 'SEARCHED_FOR' => 'Search term used', 'SEARCHED_TOPIC' => 'Searched topic', diff --git a/phpBB/search.php b/phpBB/search.php index 13f20fb72d..67f6f4dbb5 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -602,7 +602,6 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'PHRASE_SEARCH_DISABLED' => $phrase_search_disabled, - 'REFERER_IS_SEARCH' => strpos($user->referer, "search.$phpEx") !== false, 'TOTAL_MATCHES' => $total_match_count, 'SEARCH_IN_RESULTS' => ($search_id) ? false : true, diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 44b479ab3f..3096d08318 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -6,7 +6,7 @@

{L_RETURN_TO_TOPIC}

-

{L_RETURN_TO_SEARCH_ADV}

+

{L_GO_TO_SEARCH_ADV}

diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html index 8062fed9a0..71eca203bc 100644 --- a/phpBB/styles/prosilver/template/message_body.html +++ b/phpBB/styles/prosilver/template/message_body.html @@ -8,7 +8,7 @@

{MESSAGE_TITLE}

{MESSAGE_TEXT}

-

{L_RETURN_TO_SEARCH_ADV}

+

{L_GO_TO_SEARCH_ADV}

diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 6ee5be3b8f..396b698e2d 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -7,8 +7,8 @@

{L_RETURN_TO_TOPIC}

- -

{L_RETURN_TO_SEARCH_ADV}

+ +

{L_GO_TO_SEARCH_ADV}