Changeset 2593:6741802596a0 for inc/public/prepend.php

Timestamp:

11/27/13 16:32:38 (12 years ago)

Author:

Dsls

Branch:

twig

Children:

2612:1537212bd291, 2613:014098e27ea0

Parents:

2468:d7fda5a0bd39 (diff), 2589:3d427735ca70 (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:

Fusion avec default

File:

• inc/public/prepend.php (modified) (4 diffs)

inc/public/prepend.php

@@ -101 +101 @@
      }
 }
-     
+
 # If theme doesn't exist, stop everything
 if (!$core->themes->moduleExists($__theme)) {
@@ -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;
 
@@ -145 +150 @@
      # --BEHAVIOR-- publicBeforeDocument
      $core->callBehavior('publicBeforeDocument',$core);
-     
+
      $core->url->getDocument();
-     
+
      # --BEHAVIOR-- publicAfterDocument
      $core->callBehavior('publicAfterDocument',$core);
@@ -155 +160 @@
           ,660);
 }
-?>