Changeset 5123 for trunk/include/functions.inc.php

Timestamp:

Mar 13, 2010, 1:00:52 AM (14 years ago)

Author:

plg

Message:

feature 1502: based on Dotclear model, P@t has reorganized the way Piwigo
manages template/theme in a simpler "theme only level" architecture. It
supports multiple level inheritance.

File:

• trunk/include/functions.inc.php (modified) (3 diffs)

trunk/include/functions.inc.php

@@ -612 +612 @@
     trigger_action('loading_lang');
     load_language('local.lang', '', array('no_fallback'=>true) );
-    list($tmpl, $thm) = explode('/', get_default_template());
-    $template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
+    $template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme());
   }
   else
   {
-    $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme']);
+    $template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme']);
   }
 
@@ -711 +710 @@
 
 /**
- * returns available template/theme
+ * returns available themes
  */
 function get_pwg_themes()
@@ -718 +717 @@
   $themes = array();
 
-  $template_dir = PHPWG_ROOT_PATH.'template';
-
-  foreach (get_dirs($template_dir) as $template)
-  {
-    if ( $template != 'default' )
-        {
-      foreach (get_dirs($template_dir.'/'.$template.'/theme') as $theme)
-      {
-        array_push($themes, $template.'/'.$theme);
-      }
-        }
+  $template_dir = PHPWG_ROOT_PATH.'themes';
+
+  foreach (get_dirs($template_dir) as $theme)
+  {
+    if ( $theme != 'default' )
+          {
+      array_push($themes, $theme);
+          }
   }