Merge branch 'main' into gridproductimage

OpenMage · Aug 8, 2024 · c69ddb2 · c69ddb2
2 parents dfae985 + 4005bc3
commit c69ddb2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/Mage.php b/app/Mage.php
@@ -214,7 +214,7 @@ public static function getOpenMageVersionInfo(): array
             return [
                 'major'     => '20',
                 'minor'     => '10',
-                'patch'     => '0',
+                'patch'     => '2',
                 'stability' => '', // beta,alpha,rc
                 'number'    => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
             ];

diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
@@ -21,6 +21,8 @@
  */
 class Mage_Adminhtml_Model_System_Config_Backend_File extends Mage_Core_Model_Config_Data
 {
+    public const SYSTEM_FILESYSTEM_REGEX = '/{{([a-z_]+)}}(.*)/';
+
     /**
      * Upload max file size in kilobytes
      *
@@ -144,6 +146,12 @@ protected function _getUploadDir()
      */
     protected function _getUploadRoot($token)
     {
+        $value = Mage::getStoreConfig($token) ?? '';
+        if (strlen($value) && preg_match(self::SYSTEM_FILESYSTEM_REGEX, $value, $matches) !== false) {
+            $dir = str_replace('root_dir', 'base_dir', $matches[1]);
+            $path = str_replace('/', DS, $matches[2]);
+            return Mage::getConfig()->getOptions()->getData($dir) . $path;
+        }
         return Mage::getBaseDir('media');
     }