From f013363152368448a1d9ab2e72fe9762d3ae29a1 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 12 Sep 2016 08:39:10 +0200
Subject: [PATCH] Fix current type of searched messages on conversation pages

---
 language/de.xml                                | 1 +
 language/en.xml                                | 1 +
 templates/__searchAreaConversationSettings.tpl | 9 ++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/language/de.xml b/language/de.xml
index 7a17ef7..c6db720 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -175,6 +175,7 @@
 	</category>
 	
 	<category name="wcf.search">
+		<item name="wcf.search.type.com.woltlab.wcf.conversation"><![CDATA[Diese Konversation]]></item>
 		<item name="wcf.search.type.com.woltlab.wcf.conversation.message"><![CDATA[Konversationen]]></item>
 		<item name="wcf.search.object.com.woltlab.wcf.conversation.message"><![CDATA[Konversation]]></item>
 	</category>
diff --git a/language/en.xml b/language/en.xml
index ce5901d..461fbb9 100644
--- a/language/en.xml
+++ b/language/en.xml
@@ -178,6 +178,7 @@
 	</category>
 	
 	<category name="wcf.search">
+		<item name="wcf.search.type.com.woltlab.wcf.conversation"><![CDATA[This Conversation]]></item>
 		<item name="wcf.search.type.com.woltlab.wcf.conversation.message"><![CDATA[Conversations]]></item>
 		<item name="wcf.search.object.com.woltlab.wcf.conversation.message"><![CDATA[Conversation]]></item>
 	</category>
diff --git a/templates/__searchAreaConversationSettings.tpl b/templates/__searchAreaConversationSettings.tpl
index 5b9c7d4..532987a 100644
--- a/templates/__searchAreaConversationSettings.tpl
+++ b/templates/__searchAreaConversationSettings.tpl
@@ -1,5 +1,8 @@
 {if $__searchAreaInitialized|empty && $templateName|substr:0:12 == 'conversation'}
-	{capture assign='__searchInputPlaceholder'}{if $conversation|isset}{lang}wcf.conversation.searchConversation{/lang}{else}{lang}wcf.conversation.searchConversations{/lang}{/if}{/capture}
-	{capture assign='__searchHiddenInputFields'}<input type="hidden" name="types[]" value="com.woltlab.wcf.conversation.message">{if $conversation|isset}<input type="hidden" name="conversationID" value="{@$conversation->conversationID}">{/if}{/capture}
-	{assign var='__searchAreaInitialized' value=true}
+	{assign var='__searchObjectTypeName' value='com.woltlab.wcf.conversation.message'}
+	
+	{if $__wcf->getActivePage()->identifier == 'com.woltlab.wcf.conversation.Conversation'}
+		{capture assign='__searchTypeLabel'}{lang}wcf.search.type.com.woltlab.wcf.conversation{/lang}{/capture}
+		{capture assign='__searchTypesScoped'}<li><a href="#" data-extended-link="{link controller='Search'}types[]=com.woltlab.wcf.conversation.message{/link}" data-object-type="com.woltlab.wcf.conversation.message" data-parameters='{ "conversationID": {@$conversation->conversationID} }'>{lang}wcf.search.type.com.woltlab.wcf.conversation{/lang}</a></li>{/capture}
+	{/if}
 {/if}
-- 
2.20.1