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 d60499f64ee4f4f1388f3f27e26c90a14485254a..fcd33d7241cbb4147a9c7b4ce9338550053dd0d0 100644 (file)
--- 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 33eb964f93dd558eb3c3300b0a5c9e39c87b32f4..ba79cf44e37b3e23e30f439d0334dd775a49c080 100644 (file)
--- 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">