Merge remote-tracking branch 'trigger/AC-1989' into AC-1963

Author: xmav

app/code/Magento/MediaStorage/App/Media.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Media application
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -45,8 +43,6 @@ class Media implements AppInterface
     private $isAllowed;
 
     /**
-     * Media directory path
-     *
      * @var string
      */
     private $mediaDirectoryPath;
@@ -238,7 +234,10 @@ private function createLocalCopy(): void
      */
     private function checkMediaDirectoryChanged(): bool
     {
-        return rtrim($this->mediaDirectoryPath, '/') !== rtrim($this->directoryMedia->getAbsolutePath(), '/');
+        $mediaDirectoryPath = $this->mediaDirectoryPath ? rtrim($this->mediaDirectoryPath, '/') : '';
+        $directoryMediaAbsolutePath = $this->directoryMedia->getAbsolutePath();
+        $directoryMediaAbsolutePath = $directoryMediaAbsolutePath ? rtrim($directoryMediaAbsolutePath, '/') : '';
+        return $mediaDirectoryPath !== $directoryMediaAbsolutePath;
     }
 
     /**

app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php

@@ -215,7 +215,7 @@ public function getForm()
     public function getJsTemplateName()
     {
         $templateCode = $this->getModel()->getTemplateCode();
-        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         return $templateCode ? addcslashes($templateCode, "\"\r\n\\") : '';
     }