Fixed uploading attachments in inline editor

diff --git a/wcfsetup/install/files/js/WCF.Attachment.js b/wcfsetup/install/files/js/WCF.Attachment.js
index ae3c594180a1d32e20acb77e16ff963124d406ec..92e8c431a80c28dc4086a6594042c3292341b142 100644 (file)
--- a/wcfsetup/install/files/js/WCF.Attachment.js
+++ b/wcfsetup/install/files/js/WCF.Attachment.js
@@ -84,9 +84,9 @@ WCF.Attachment.Upload = WCF.Upload.extend({
                }
                
                if (this._wysiwygContainerID) {
-                       WCF.System.Event.addListener('com.woltlab.wcf.messageOptionsInline', 'submit_' + this._wysiwygContainerID, $.proxy(this._submitInline, this));
+                       WCF.System.Event.addListener('com.woltlab.wcf.redactor2', 'submit_' + this._wysiwygContainerID, $.proxy(this._submitInline, this));
                        WCF.System.Event.addListener('com.woltlab.wcf.messageOptionsInline', 'prepareExtended_' + this._wysiwygContainerID, $.proxy(this._prepareExtended, this));
-                       WCF.System.Event.addListener('com.woltlab.wcf.redactor', 'reset', $.proxy(this._reset, this));
+                       WCF.System.Event.addListener('com.woltlab.wcf.redactor2', 'reset', $.proxy(this._reset, this));
                        WCF.System.Event.addListener('com.woltlab.wcf.redactor', 'upload_' + this._wysiwygContainerID, $.proxy(this._editorUpload, this));
                        WCF.System.Event.addListener('com.woltlab.wcf.redactor', 'getImageAttachments_' + this._wysiwygContainerID, $.proxy(this._getImageAttachments, this));
                }

diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Message/Reply.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Message/Reply.js
index 0b84ebc7a6e5ef79c354443a31abccd0c11f0b72..593ae051befedf36ed333d14d64053c0a13076a9 100644 (file)
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Message/Reply.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Message/Reply.js
@@ -76,7 +76,7 @@ define(['Ajax', 'Core', 'EventHandler', 'Language', 'Dom/Util', 'Ui/Notification
                        var parameters = DomUtil.getDataAttributes(this._container, 'data-', true, true);
                        parameters.data = { message: this._getEditor().code.get() };
                        
-                       EventHandler.fire('com.woltlab.wcf.redactor2', 'submit_text', parameters);
+                       EventHandler.fire('com.woltlab.wcf.redactor2', 'submit_text', parameters.data);
                        
                        Ajax.api(this, {
                                parameters: parameters