Fixed detection of embedded objects in conversation messages

diff --git a/files/lib/data/conversation/message/ConversationMessageAction.class.php b/files/lib/data/conversation/message/ConversationMessageAction.class.php
index 1a614fa2c8212faeb933b5c9cd3ea27b3f9c8810..6d5fc83bb2c5eb338b960287111ff360da4b0575 100644 (file)
--- a/files/lib/data/conversation/message/ConversationMessageAction.class.php
+++ b/files/lib/data/conversation/message/ConversationMessageAction.class.php
@@ -132,6 +132,11 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
                // update search index
                SearchIndexManager::getInstance()->add('com.woltlab.wcf.conversation.message', $message->messageID, $message->message, (!empty($this->parameters['isFirstPost']) ? $conversation->subject : ''), $message->time, $message->userID, $message->username);
                
+               // update attachments
+               if (isset($this->parameters['attachmentHandler']) && $this->parameters['attachmentHandler'] !== null) {
+                       $this->parameters['attachmentHandler']->updateObjectID($message->messageID);
+               }
+               
                // save embedded objects
                if (MessageEmbeddedObjectManager::getInstance()->registerObjects('com.woltlab.wcf.conversation.message', $message->messageID, $message->message)) {
                        $messageEditor->update(array(
@@ -139,11 +144,6 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
                        ));
                }
                
-               // update attachments
-               if (isset($this->parameters['attachmentHandler']) && $this->parameters['attachmentHandler'] !== null) {
-                       $this->parameters['attachmentHandler']->updateObjectID($message->messageID);
-               }
-               
                // clear quotes
                if (isset($this->parameters['removeQuoteIDs']) && !empty($this->parameters['removeQuoteIDs'])) {
                        MessageQuoteManager::getInstance()->markQuotesForRemoval($this->parameters['removeQuoteIDs']);