Changes in plugins/themeEditor/class.themeEditor.php [2566:9bf417837888:2607:2a4091ec08c4]

File:

• plugins/themeEditor/class.themeEditor.php (modified) (3 diffs)

plugins/themeEditor/class.themeEditor.php

@@ -16 +16 @@
      protected $core;
 
-     protected $default_theme;
      protected $user_theme;
      protected $parent_theme;
-
-     protected $default_tpl = array();
+     protected $tplset_theme;
+
      public $tpl = array();
      public $css = array();
@@ -31 +30 @@
           $this->default_theme = path::real($this->core->blog->themes_path.'/default');
           $this->user_theme = path::real($this->core->blog->themes_path.'/'.$this->core->blog->settings->system->theme);
+          $this->tplset_theme = DC_ROOT.'/inc/public/default-templates/'.DC_DEFAULT_TPLSET;
           if (null !== $this->core->themes) {
                $parent_theme = $this->core->themes->moduleInfo($this->core->blog->settings->system->theme,'parent');
                if ($parent_theme) {
                     $this->parent_theme = path::real($this->core->blog->themes_path.'/'.$parent_theme);
+               }
+               $tplset = $this->core->themes->moduleInfo($this->core->blog->settings->system->theme,'tplset');
+               if ($tplset) {
+                    $this->tplset_theme = DC_ROOT.'/inc/public/default-templates/'.$tplset;
                }
           }
@@ -207 +211 @@
      protected function findTemplates()
      {
-          # First, we look in template paths
-          $this->default_tpl = $this->getFilesInDir($this->default_theme.'/tpl');
-
           $this->tpl = array_merge(
-               $this->default_tpl,
+               $this->getFilesInDir($this->tplset_theme),
                $this->getFilesInDir($this->parent_theme.'/tpl'),
                $this->getFilesInDir($this->user_theme.'/tpl')
                );
-          $this->tpl = array_merge($this->getFilesInDir(DC_ROOT.'/inc/public/default-templates'),$this->tpl);
 
           # Then we look in 'default-templates' plugins directory