Fixed disallowed bbcodes in message preview

diff --git a/wcfsetup/install/files/lib/data/bbcode/MessagePreviewAction.class.php b/wcfsetup/install/files/lib/data/bbcode/MessagePreviewAction.class.php
index 6315f4bf91fde62400306969c5a12cc3cc201ef2..30d3b52266e2629fd85041f3717c17f4f5a1ef01 100644 (file)
--- a/wcfsetup/install/files/lib/data/bbcode/MessagePreviewAction.class.php
+++ b/wcfsetup/install/files/lib/data/bbcode/MessagePreviewAction.class.php
@@ -38,13 +38,17 @@ class MessagePreviewAction extends BBCodeAction {
         * @throws      UserInputException
         */
        public function getMessagePreview() {
+               // set disallowed bbcodes first to ensure proper parsing
+               $disallowedBBCodesPermission = isset($this->parameters['disallowedBBCodesPermission']) ? $this->parameters['disallowedBBCodesPermission'] : 'user.message.disallowedBBCodes';
+               if ($disallowedBBCodesPermission) {
+                       BBCodeHandler::getInstance()->setDisallowedBBCodes(ArrayUtil::trim(explode(',', WCF::getSession()->getPermission($disallowedBBCodesPermission))));
+               }
+               
                $htmlInputProcessor = new HtmlInputProcessor();
                $htmlInputProcessor->process($this->parameters['data']['message'], $this->parameters['messageObjectType'], $this->parameters['messageObjectID']);
                
                // check if disallowed bbcode are used
-               $disallowedBBCodesPermission = isset($this->parameters['disallowedBBCodesPermission']) ? $this->parameters['disallowedBBCodesPermission'] : 'user.message.disallowedBBCodes';
                if ($disallowedBBCodesPermission) {
-                       BBCodeHandler::getInstance()->setDisallowedBBCodes(ArrayUtil::trim(explode(',', WCF::getSession()->getPermission($disallowedBBCodesPermission))));
                        $disallowedBBCodes = $htmlInputProcessor->validate();
                        if (!empty($disallowedBBCodes)) {
                                throw new UserInputException('message', WCF::getLanguage()->getDynamicVariable('wcf.message.error.disallowedBBCodes', [