From 1094de49c2eb693517bcdb57fcb4e6f9c2155bda Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sat, 6 Sep 2014 14:53:14 +0200
Subject: [PATCH] [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 @@
 
 <!-- IF SEARCH_TOPIC -->
 	<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO_TOPIC}</a></p>
-<!-- ELSE -->
+<!-- ELSE IF REFERER_IS_SEARCH -->
 	<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>
 <!-- ENDIF -->