Fixed quote insert while editing a message

diff --git a/files/js/WCF.Conversation.js b/files/js/WCF.Conversation.js
index 337aa5b3e1e9a481f59a0cb87032834308525811..17a7a0f17d889c0268ba9af7e526d5d439e47c32 100644 (file)
--- a/files/js/WCF.Conversation.js
+++ b/files/js/WCF.Conversation.js
@@ -1533,8 +1533,8 @@ WCF.Conversation.Message.InlineEditor = WCF.Message.InlineEditor.extend({
        /**
         * @see WCF.Message.InlineEditor.init()
         */
-       init: function(containerID) {
-               this._super(containerID, true);
+       init: function(containerID, quoteManager) {
+               this._super(containerID, true, quoteManager);
        },
        
        /**

diff --git a/templates/conversation.tpl b/templates/conversation.tpl
index 6294a9d287bbb185d1593a5d76d793d3846c8da5..219fab60a792fc8300d2e7ec6c1344a623ae8932 100644 (file)
--- a/templates/conversation.tpl
+++ b/templates/conversation.tpl
@@ -30,11 +30,11 @@
                        var $inlineEditor = new WCF.Conversation.InlineEditor('.conversation');
                        $inlineEditor.setEditorHandler($editorHandler);
                        
-                       new WCF.Conversation.Message.InlineEditor({@$conversation->conversationID});
-                       
                        {assign var=__supportPaste value=true}
                        {if $conversation->isClosed}{assign var=__supportPaste value=false}{/if}
                        {include file='__messageQuoteManager' wysiwygSelector='text' supportPaste=$__supportPaste}
+                       
+                       new WCF.Conversation.Message.InlineEditor({@$conversation->conversationID}, $quoteManager);
                        new WCF.Conversation.Message.QuoteHandler($quoteManager);
                        {if !$conversation->isClosed}new WCF.Conversation.QuickReply($quoteManager);{/if}