Re-add possibility to get original value

sreichel · Jul 28, 2024 · e9b8c7c · e9b8c7c
1 parent ae5df65
commit e9b8c7c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/app/Mage.php b/app/Mage.php
@@ -433,7 +433,7 @@ public static function getStoreConfigAsInt(string $path, $store = null): int
      * Retrieve config flag for store by path
      *
      * @param string $path
-     * @param mixed $store
+     * @param null|string|bool|int|Mage_Core_Model_Store $store
      * @return bool
      */
     public static function getStoreConfigFlag($path, $store = null)
@@ -447,6 +447,20 @@ public static function getStoreConfigFlag($path, $store = null)
         }
     }
 
+
+    /**
+     * @param string $path
+     * @param null|string|bool|int|Mage_Core_Model_Store $store
+     * @param array|null $allowedTags
+     * @return Mage_Core_Model_Security_HtmlEscapedString
+     */
+    public static function getStoreConfigObject(string $path, $store = null, ?array $allowedTags = []): Mage_Core_Model_Security_HtmlEscapedString
+    {
+        $config = (string) self::getStoreConfig($path, $store);
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        return new Mage_Core_Model_Security_HtmlEscapedString($config, $allowedTags);
+    }
+
     /**
      * Get base URL path by type
      *

diff --git a/app/code/core/Mage/Page/Block/Html/Header.php b/app/code/core/Mage/Page/Block/Html/Header.php
@@ -57,7 +57,7 @@ public function setLogo($logo_src, $logo_alt)
     public function getLogoSrc()
     {
         if (empty($this->_data['logo_src'])) {
-            $this->_data['logo_src'] = $this->escapeHtml((string) Mage::getStoreConfig('design/header/logo_src'));
+            $this->_data['logo_src'] = Mage::getStoreConfigObject('design/header/logo_src');
         }
         return $this->getSkinUrl($this->_data['logo_src']);
     }
@@ -68,7 +68,7 @@ public function getLogoSrc()
     public function getLogoSrcSmall()
     {
         if (empty($this->_data['logo_src_small'])) {
-            $this->_data['logo_src_small'] = $this->escapeHtml((string) Mage::getStoreConfig('design/header/logo_src_small'));
+            $this->_data['logo_src_small'] = Mage::getStoreConfigObject('design/header/logo_src_small');
         }
         return $this->getSkinUrl($this->_data['logo_src_small']);
     }
@@ -79,7 +79,7 @@ public function getLogoSrcSmall()
     public function getLogoAlt()
     {
         if (empty($this->_data['logo_alt'])) {
-            $this->_data['logo_alt'] = $this->escapeHtml((string) Mage::getStoreConfig('design/header/logo_alt'));
+            $this->_data['logo_alt'] = Mage::getStoreConfigObject('design/header/logo_alt');
         }
         return $this->_data['logo_alt'];
     }
@@ -97,7 +97,7 @@ public function getWelcome()
             if (Mage::isInstalled() && Mage::getSingleton('customer/session')->isLoggedIn()) {
                 $this->_data['welcome'] = $this->__('Welcome, %s!', $this->escapeHtml(Mage::getSingleton('customer/session')->getCustomer()->getName()));
             } else {
-                $this->_data['welcome'] = $this->escapeHtml((string) Mage::getStoreConfig('design/header/welcome'));
+                $this->_data['welcome'] = Mage::getStoreConfigObject('design/header/welcome');
             }
         }
 

diff --git a/app/code/core/Mage/Page/Block/Html/Welcome.php b/app/code/core/Mage/Page/Block/Html/Welcome.php
@@ -44,7 +44,7 @@ protected function _toHtml()
             if (Mage::isInstalled() && $this->_getSession()->isLoggedIn()) {
                 $this->_data['welcome'] = $this->__('Welcome, %s!', $this->escapeHtml($this->_getSession()->getCustomer()->getName()));
             } else {
-                $this->_data['welcome'] = $this->escapeHtml((string) Mage::getStoreConfig('design/header/welcome'));
+                $this->_data['welcome'] = Mage::getStoreConfigObject('design/header/welcome');
             }
         }