|
11 | 11 | use Magento\Cms\Block\Block;
|
12 | 12 | use Magento\Framework\App\Area;
|
13 | 13 | use Magento\Framework\App\Config\ScopeConfigInterface;
|
| 14 | +use Magento\Framework\App\ObjectManager; |
14 | 15 | use Magento\Framework\App\State;
|
15 | 16 | use Magento\Framework\Css\PreProcessor\Adapter\CssInliner;
|
16 | 17 | use Magento\Framework\Escaper;
|
|
30 | 31 | use Magento\Framework\View\Element\AbstractBlock;
|
31 | 32 | use Magento\Framework\View\LayoutFactory;
|
32 | 33 | use Magento\Framework\View\LayoutInterface;
|
| 34 | +use Magento\Store\Model\Information as StoreInformation; |
33 | 35 | use Magento\Store\Model\ScopeInterface;
|
34 | 36 | use Magento\Store\Model\StoreManagerInterface;
|
35 | 37 | use Magento\Variable\Model\Source\Variables;
|
36 | 38 | use Magento\Variable\Model\Variable;
|
37 | 39 | use Magento\Variable\Model\VariableFactory;
|
38 | 40 | use Psr\Log\LoggerInterface;
|
39 |
| -use Magento\Store\Model\Information as StoreInformation; |
40 |
| -use Magento\Framework\App\ObjectManager; |
41 | 41 |
|
42 | 42 | /**
|
43 | 43 | * Core Email Template Filter Model
|
@@ -591,7 +591,10 @@ public function storeDirective($construction)
|
591 | 591 | unset($params['url']);
|
592 | 592 | }
|
593 | 593 |
|
594 |
| - // Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl in multi-store environment |
| 594 | + /** |
| 595 | + * Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl |
| 596 | + * in multi-store environment |
| 597 | + */ |
595 | 598 | $this->urlModel->setScope($this->_storeManager->getStore());
|
596 | 599 | $params['_escape_params'] = $this->_storeManager->getStore()->getCode();
|
597 | 600 |
|
@@ -858,8 +861,8 @@ public function configDirective($construction)
|
858 | 861 | if ($params['path'] == $this->storeInformation::XML_PATH_STORE_INFO_COUNTRY_CODE) {
|
859 | 862 | $configValue = $storeInformationObj->getData('country');
|
860 | 863 | } elseif ($params['path'] == $this->storeInformation::XML_PATH_STORE_INFO_REGION_CODE) {
|
861 |
| - $configValue = $storeInformationObj->getData('region')? |
862 |
| - $storeInformationObj->getData('region'): |
| 864 | + $configValue = $storeInformationObj->getData('region') ? |
| 865 | + $storeInformationObj->getData('region') : |
863 | 866 | $configValue;
|
864 | 867 | }
|
865 | 868 | }
|
|
0 commit comments