🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15256: Fixed typo in method name (by @olmer)
 - #15137: fix: do not forcefully set area in template if it is already set, fixes #14968, fixes #13530 (by @DanielRuf)


Fixed GitHub Issues:
 - #13530: "Template file 'header.html' is not found" error while trying to save Design Configuration. (reported by @hostep) has been fixed in #15137 by @DanielRuf in 2.2-develop branch
   Related commits:
     1. 0ae1230
     2. 3df51d4
     3. 0dec988
     4. d92b679

 - #14968: Can't change the applied theme in 2.2.4 (reported by @Krapulat) has been fixed in #15137 by @DanielRuf in 2.2-develop branch
   Related commits:
     1. 0ae1230
     2. 3df51d4
     3. 0dec988
     4. d92b679

Author: magento-engcom-team

app/code/Magento/Email/Model/AbstractTemplate.php

@@ -534,10 +534,9 @@ protected function cancelDesignConfig()
      */
     public function setForcedArea($templateId)
     {
-        if ($this->area) {
-            throw new \LogicException(__('Area is already set'));
+        if (!isset($this->area)) {
+            $this->area = $this->emailConfig->getTemplateArea($templateId);
         }
-        $this->area = $this->emailConfig->getTemplateArea($templateId);
         return $this;
     }
 

lib/internal/Magento/Framework/App/Request/Http.php

@@ -149,7 +149,7 @@ public function setPathInfo($pathInfo = null)
                 return $this;
             }
 
-            $requestUri = $this->removeRepitedSlashes($requestUri);
+            $requestUri = $this->removeRepeatedSlashes($requestUri);
             $parsedRequestUri = explode('?', $requestUri, 2);
             $queryString = !isset($parsedRequestUri[1]) ? '' : '?' . $parsedRequestUri[1];
             $baseUrl = $this->getBaseUrl();
@@ -172,7 +172,7 @@ public function setPathInfo($pathInfo = null)
      * @param string $pathInfo
      * @return string
      */
-    private function removeRepitedSlashes($pathInfo)
+    private function removeRepeatedSlashes($pathInfo)
     {
         $firstChar = (string)substr($pathInfo, 0, 1);
         if ($firstChar == '/') {