Changeset 5123 for trunk/include/functions_user.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_user.inc.php (modified) (2 diffs)

trunk/include/functions_user.inc.php

@@ -246 +246 @@
   $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
 
-  list($user['template'], $user['theme']) = explode('/', $user['template']);
+  // Check user theme
+  if (!file_exists(PHPWG_ROOT_PATH.'themes/'.$user['theme'].'/themeconf.inc.php'))
+  {
+    $user['theme'] = $conf['default_theme'];
+  }
 
   return $user;
@@ -842 +846 @@
  *
  */
-function get_default_template()
-{
-  return get_default_user_value('template', PHPWG_DEFAULT_TEMPLATE);
+function get_default_theme()
+{
+  return get_default_user_value('theme', PHPWG_DEFAULT_TEMPLATE);
 }