Using a generic named variable for the text of an object

diff --git a/files/lib/data/conversation/message/ConversationMessageAction.class.php b/files/lib/data/conversation/message/ConversationMessageAction.class.php
index c28e81e3f3918a7a72ea0ca5c2fb57fbde30efd6..05a370418477a49c188d35e50f15c0b696bae9ee 100644 (file)
--- a/files/lib/data/conversation/message/ConversationMessageAction.class.php
+++ b/files/lib/data/conversation/message/ConversationMessageAction.class.php
@@ -373,7 +373,7 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
         WCF::getTPL()->assign([
             'defaultSmilies' => SmileyCache::getInstance()->getCategorySmilies(),
             'message' => $this->message,
-            'messageText' => $upcastProcessor->getHtml(),
+            'text' => $upcastProcessor->getHtml(),
             'permissionCanUseSmilies' => 'user.message.canUseSmilies',
             'wysiwygSelector' => 'messageEditor' . $this->message->messageID,
         ]);

diff --git a/templates/conversationMessageInlineEditor.tpl b/templates/conversationMessageInlineEditor.tpl
index 60575ee4da2144cee05ba35197c80b9a741901a3..2bda5afcfe2ac7eaf95c64a148e1e29c22fdb513 100644 (file)
--- a/templates/conversationMessageInlineEditor.tpl
+++ b/templates/conversationMessageInlineEditor.tpl
@@ -3,7 +3,7 @@
        <textarea id="{$wysiwygSelector}" class="wysiwygTextarea"
                data-autosave="com.woltlab.wcf.conversation.messageEdit-{$message->messageID}"
                data-support-mention="true"
-       >{$messageText}</textarea>
+       >{$text}</textarea>
        {capture assign=wysiwygContainerID}messageEditor{@$message->messageID}{/capture}
        {include file='messageFormTabsInline' inConversationInlineEdit=true wysiwygContainerID=$wysiwygContainerID}