Changeset 2862:53cb018029a4
- Timestamp:
- 12/20/14 00:04:20 (9 years ago)
- Branch:
- 2.7
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
plugins/themeEditor/class.themeEditor.php
r2663 r2862 20 20 protected $tplset_theme; 21 21 22 protected $tplset_name; 23 22 24 public $tpl = array(); 23 25 public $css = array(); … … 31 33 $this->user_theme = path::real($this->core->blog->themes_path.'/'.$this->core->blog->settings->system->theme); 32 34 $this->tplset_theme = DC_ROOT.'/inc/public/default-templates/'.DC_DEFAULT_TPLSET; 35 $this->tplset_name = DC_DEFAULT_TPLSET; 33 36 if (null !== $this->core->themes) { 34 37 $parent_theme = $this->core->themes->moduleInfo($this->core->blog->settings->system->theme,'parent'); … … 39 42 if ($tplset) { 40 43 $this->tplset_theme = DC_ROOT.'/inc/public/default-templates/'.$tplset; 44 $this->tplset_name = $tplset; 41 45 } 42 46 } … … 295 299 $plugins = $this->core->plugins->getModules(); 296 300 foreach ($plugins as $p) { 301 // Looking in default-templates directory 297 302 $this->tpl = array_merge($this->getFilesInDir($p['root'].'/default-templates'),$this->tpl); 298 303 $this->tpl_model = array_merge($this->getFilesInDir($p['root'].'/default-templates'),$this->tpl_model); 304 // Looking in default-templates/tplset directory 305 $this->tpl = array_merge($this->getFilesInDir($p['root'].'/default-templates/'.$this->tplset_name),$this->tpl); 306 $this->tpl_model = array_merge($this->getFilesInDir($p['root'].'/default-templates/'.$this->tplset_name),$this->tpl_model); 299 307 } 300 308
Note: See TracChangeset
for help on using the changeset viewer.