MAGETWO-57656: Base url should be processed while sending email

Karpenko, Oleksandr · Karpenko, Oleksandr · commit 2ac859ef0449 · 2016-08-30T11:48:10.000+03:00
diff --git a/lib/internal/Magento/Framework/View/Asset/NotationResolver/Variable.php b/lib/internal/Magento/Framework/View/Asset/NotationResolver/Variable.php
@@ -49,7 +49,7 @@ public function convertVariableNotation($path)
             $replacements = [];
             foreach ($matches as $match) {
                 if (!isset($replacements[$match[0]])) {
-                    $replacements[$match[0]] = $this->preProcessPlaceholder($match[1]);
+                    $replacements[$match[0]] = $this->getPlaceholderValue($match[1]);
                 }
             }
             $path = str_replace(array_keys($replacements), $replacements, $path);
@@ -63,7 +63,7 @@ public function convertVariableNotation($path)
      * @param string $placeholder
      * @return string
      */
-    public function preProcessPlaceholder($placeholder)
+    public function getPlaceholderValue($placeholder)
     {
         /** @var \Magento\Framework\View\Asset\File\FallbackContext $context */
         $context = $this->assetRepo->getStaticViewFileContext();

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function convertVariableNotation($path)`
`49`	`49`	`$replacements = [];`
`50`	`50`	`foreach ($matches as $match) {`
`51`	`51`	`if (!isset($replacements[$match[0]])) {`
`52`		`- $replacements[$match[0]] = $this->preProcessPlaceholder($match[1]);`
	`52`	`+ $replacements[$match[0]] = $this->getPlaceholderValue($match[1]);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`$path = str_replace(array_keys($replacements), $replacements, $path);`
`@@ -63,7 +63,7 @@ public function convertVariableNotation($path)`
`63`	`63`	`* @param string $placeholder`
`64`	`64`	`* @return string`
`65`	`65`	`*/`
`66`		`- public function preProcessPlaceholder($placeholder)`
	`66`	`+ public function getPlaceholderValue($placeholder)`
`67`	`67`	`{`
`68`	`68`	`/** @var \Magento\Framework\View\Asset\File\FallbackContext $context */`
`69`	`69`	`$context = $this->assetRepo->getStaticViewFileContext();`