Changeset 524

Timestamp:

Sep 18, 2004, 6:07:40 PM (20 years ago)

Author:

z0rglub

Message:

code refactoring

File:

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

trunk/include/functions_user.inc.php

@@ -213 +213 @@
 {
   global $conf, $template, $lang, $lang_info;
-    
+  
   $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_language'];
-  $style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_template'];
- 
+
+  if (!empty($userdata['template']) and !$userdata['is_the_guest'])
+  {
+    $template = $userdata['template'];
+  }
+  else
+  {
+    $template = $conf['default_template'];
+  }
+
   if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) )
   {
@@ -232 +240 @@
   include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/admin.lang.php');
   }
-  
-  $template= setup_style($style);
+
+  $template = setup_style($template);
   return;
 }