Merge pull request #7388 from magento-cia/2.4.5-bugfixes-011022

Bugfixes

Author: dvoskoboinikov

app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php

@@ -20,12 +20,12 @@ class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements Ht
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::comment';
+    public const ADMIN_RESOURCE = 'Magento_Sales::comment';
 
     /**
      * ACL resource needed to send comment email notification
      */
-    const ADMIN_SALES_EMAIL_RESOURCE = 'Magento_Sales::emails';
+    public const ADMIN_SALES_EMAIL_RESOURCE = 'Magento_Sales::emails';
 
     /**
      * Add order comment action
@@ -52,13 +52,12 @@ public function execute()
                     $notify = false;
                 }
 
-                $history = $order->addStatusHistoryComment($data['comment'], $data['status']);
+                $comment = trim(strip_tags($data['comment']));
+                $history = $order->addStatusHistoryComment($comment, $data['status']);
                 $history->setIsVisibleOnFront($visible);
                 $history->setIsCustomerNotified($notify);
                 $history->save();
 
-                $comment = trim(strip_tags($data['comment']));
-
                 $order->save();
                 /** @var OrderCommentSender $orderCommentSender */
                 $orderCommentSender = $this->_objectManager

app/code/Magento/Store/etc/config.xml

@@ -135,6 +135,7 @@
                     <pht>pht</pht>
                     <phar>phar</phar>
                     <svg>svg</svg>
+                    <svgz>svgz</svgz>
                     <xml>xml</xml>
                     <xhtml>xhtml</xhtml>
                 </protected_extensions>