Changeset 5264

Timestamp:

Mar 22, 2010, 8:49:14 PM (14 years ago)

Author:

plg

Message:

feature 1514: improvement, if a user has a theme that is (maybe temporary)
unactive, we fallback on default theme (the real default theme, the one set
for default user)

File:

• trunk/include/functions_user.inc.php (modified) (2 diffs)

trunk/include/functions_user.inc.php

@@ -247 +247 @@
 
   // Check user theme
-  if (!file_exists(PHPWG_ROOT_PATH.'themes/'.$user['theme'].'/themeconf.inc.php'))
-  {
-    $user['theme'] = $conf['default_theme'];
+  if (!isset($user['theme_name']))
+  {
+    $user['theme'] = get_default_theme();
   }
 
@@ -293 +293 @@
   {
     $query = '
-SELECT ui.*, uc.*
-  FROM '.USER_INFOS_TABLE.' AS ui LEFT JOIN '.USER_CACHE_TABLE.' AS uc
-    ON ui.user_id = uc.user_id
+SELECT ui.*, uc.*, t.name AS theme_name
+  FROM '.USER_INFOS_TABLE.' AS ui
+    LEFT JOIN '.USER_CACHE_TABLE.' AS uc ON ui.user_id = uc.user_id
+    LEFT JOIN '.THEMES_TABLE.' AS t ON t.id = ui.theme
   WHERE ui.user_id = \''.$user_id.'\'';
     $result = pwg_query($query);