fix broken theme directories

modxcms · Jan 29, 2021 · 74b2e87 · 74b2e87
1 parent c716283
commit 74b2e87
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/_build/assets/js/Utils.js b/_build/assets/js/Utils.js
@@ -254,7 +254,7 @@ export const getTemplateSettings = (cleanRender = false) => {
     return {
         theme_dir: '{{theme_dir}}',
         template: {
-            theme_dir: cleanRender ? `[[++${fredConfig.config.themeNamespace}.theme_dir]]` : fredConfig.config.themeDir
+            theme_dir: cleanRender ? `[[++${fredConfig.config.themeSettingsPrefix}.theme_dir]]` : fredConfig.config.themeDir
         }
     };
 };
@@ -263,7 +263,7 @@ export const valueParser = (value, clean = false) => {
     if (typeof value !== 'string') return value;
 
     if (clean === true) {
-        value = value.replace('{{theme_dir}}', `[[++${fredConfig.config.themeNamespace}.theme_dir]]`);
+        value = value.replace('{{theme_dir}}', `[[++${fredConfig.config.themeSettingsPrefix}.theme_dir]]`);
 
         return value;
     }

diff --git a/core/components/fred/elements/plugins/Fred.php b/core/components/fred/elements/plugins/Fred.php
@@ -238,6 +238,7 @@
                 theme: ' . $theme->id . ',
                 themeDir: "' . $theme->getThemeFolderUri() . '",
                 themeNamespace: "'. $theme->get('namespace') .'",
+                themeSettingsPrefix: "'. $theme->get('settingsPrefix') .'",
                 assetsUrl: "' . $fred->getOption('webAssetsUrl') . '",
                 managerUrl: "' . MODX_MANAGER_URL . '",
                 fredOffUrl: "' . str_replace('&amp;', '&', $modx->makeUrl($modx->resource->id, '', array_merge($get, ['fred' => 4]) , 'full')) . '",

diff --git a/core/components/fred/model/fred/src/RenderResource.php b/core/components/fred/model/fred/src/RenderResource.php
@@ -447,9 +447,9 @@ private function renderElement($html, $item, $replaceFakes = false)
 
     private function mergeSetting($id, $settings = [])
     {
-        $settings['theme_dir'] = "[[++{$this->theme->namespace}.theme_dir]]";
+        $settings['theme_dir'] = "[[++{$this->theme->settingsPrefix}.theme_dir]]";
         $settings['template'] = [
-            'theme_dir' => "[[++{$this->theme->namespace}.theme_dir]]"
+            'theme_dir' => "[[++{$this->theme->settingsPrefix}.theme_dir]]"
         ];
 
         $settings['id'] = $id;