From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 10 Jul 2016 08:39:10 +0000 (+0200)
Subject: Automatically set active message for embedded objects
X-Git-Tag: 3.0.0_Beta_1~57
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48bb0bcf4e4d6bd793916fb26f14c173d583495c;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

Automatically set active message for embedded objects
---

diff --git a/files/lib/data/conversation/message/ConversationMessage.class.php b/files/lib/data/conversation/message/ConversationMessage.class.php
index d60499f..fcd33d7 100644
--- a/files/lib/data/conversation/message/ConversationMessage.class.php
+++ b/files/lib/data/conversation/message/ConversationMessage.class.php
@@ -59,9 +59,6 @@ class ConversationMessage extends DatabaseObject implements IMessage {
 	 * @inheritDoc
 	 */
 	public function getFormattedMessage() {
-		// assign embedded objects
-		MessageEmbeddedObjectManager::getInstance()->setActiveMessage('com.woltlab.wcf.conversation.message', $this->messageID);
-		
 		$processor = new HtmlOutputProcessor();
 		$processor->process($this->message, 'com.woltlab.wcf.conversation.message', $this->messageID);
 		
diff --git a/page.xml b/page.xml
index 33eb964..ba79cf4 100644
--- a/page.xml
+++ b/page.xml
@@ -22,6 +22,7 @@
 			<name language="en"><![CDATA[Conversation]]></name>
 			<pageType>system</pageType>
 			<requireObjectID>1</requireObjectID>
+			<hasFixedParent>1</hasFixedParent>
 			<parent>com.woltlab.wcf.conversation.ConversationList</parent>
 		</page>
 		<page identifier="com.woltlab.wcf.conversation.ConversationAdd">
@@ -29,6 +30,7 @@
 			<name language="de"><![CDATA[Konversation starten]]></name>
 			<name language="en"><![CDATA[New Conversation]]></name>
 			<pageType>system</pageType>
+			<hasFixedParent>1</hasFixedParent>
 			<parent>com.woltlab.wcf.conversation.ConversationList</parent>
 			
 			<content language="en">