Changeset 6006 for trunk

Timestamp:

Apr 29, 2010, 9:57:48 PM (15 years ago)

Author:

patdenice

Message:

feature 1502: Add $themeconfload_parent_local_head parameter

File:

• trunk/include/template.class.php (modified) (3 diffs)

trunk/include/template.class.php

@@ -111 +111 @@
    * Load theme's parameters.
    */
-  function set_theme($root, $theme, $path, $load_css=true)
+  function set_theme($root, $theme, $path, $load_css=true, $load_local_head=true)
   {
     $this->set_template_dir($root.'/'.$theme.'/'.$path);
@@ -119 +119 @@
     if (isset($themeconf['parent']) and $themeconf['parent'] != $theme)
     {
-      if (!isset($themeconf['load_parent_css']))
-      {
-        $themeconf['load_parent_css'] = $load_css;
-      }
-      $this->set_theme($root, $themeconf['parent'], $path, $themeconf['load_parent_css']);
+      $this->set_theme(
+        $root,
+        $themeconf['parent'],
+        $path,
+        isset($themeconf['load_parent_css']) ? $themeconf['load_parent_css'] : $load_css,
+        isset($themeconf['load_parent_local_head']) ? $themeconf['load_parent_local_head'] : $load_local_head
+      );
     }
 
@@ -130 +132 @@
       'load_css' => $load_css,
     );
-    if (!empty($themeconf['local_head']) )
+    if (!empty($themeconf['local_head']) and $load_local_head)
     {
       $tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] );