Changeset 2567:6c11245cbf04 for inc/public/prepend.php

Timestamp:

11/17/13 20:30:21 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2564:c8bf313d697e (diff), 2566:9bf417837888 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from 2.6

Files:

• inc/public/prepend.php (modified) (1 diff)
• inc/public/prepend.php (modified) (1 diff)

inc/public/prepend.php

@@ -160 +160 @@
           ,660);
 }
-

inc/public/prepend.php

@@ -134 +134 @@
      $__theme_tpl_path[] = $core->blog->themes_path.'/'.$__parent_theme.'/tpl';
 }
-
-$core->tpl->setPath(
-     $__theme_tpl_path,
-     dirname(__FILE__).'/default-templates',
-     $core->tpl->getPath());
-
+$tplset = $core->themes->moduleInfo($core->blog->settings->system->theme,'tplset');
+if (!empty($tplset) && is_dir(dirname(__FILE__).'/default-templates/'.$tplset)) {
+     $core->tpl->setPath(
+          $__theme_tpl_path,
+          dirname(__FILE__).'/default-templates/'.$tplset,
+          $core->tpl->getPath());
+} else {
+     $core->tpl->setPath(
+          $__theme_tpl_path,
+          $core->tpl->getPath());
+}
 $core->url->mode = $core->blog->settings->system->url_scan;