Changeset adc3e41 in github for program/include/main.inc

Timestamp:

Feb 2, 2008 2:44:37 PM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

ff08eed

Parents:

df0da2e0

Message:

Always update $CONFIG with user prefs (#1484729)

File:

• program/include/main.inc (modified) (3 diffs)

program/include/main.inc

@@ -93 +93 @@
 
   // overwrite config with user preferences
-  if (is_array($_SESSION['user_prefs']))
-    $CONFIG = array_merge($CONFIG, $_SESSION['user_prefs']);
+  $CONFIG = array_merge($CONFIG, (array)$USER->get_prefs());
 
 
@@ -592 +591 @@
   // query if user already registered
   if ($existing = rcube_user::query($user, $host))
-  $USER = $existing;
+    $USER = $existing;
 
   // user already registered -> overwrite username
@@ -609 +608 @@
     {
     // get user prefs
-    $_SESSION['user_prefs'] = $USER->get_prefs();
-    array_merge($CONFIG, $_SESSION['user_prefs']);
+    $CONFIG = array_merge($CONFIG, (array)$USER->get_prefs());
 
     // set user specific language