[xoops-svn] SF.net SVN: xoops-svn:[12249] XoopsCore/branches/2.5.x/2.5.7/htdocs/include /common.php

[<rgr...@us...>]

Revision: 12249
          http://sourceforge.net/p/xoops/svn/12249
Author:   rgriffith
Date:     2013-12-29 01:51:53 +0000 (Sun, 29 Dec 2013)
Log Message:
-----------
Fix issue #1225 -- Restore user theme choice during "Remember me" processing.

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2013-12-28 20:02:03 UTC (rev 12248)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php	2013-12-29 01:51:53 UTC (rev 12249)
@@ -251,6 +251,12 @@
         } else {
             $_SESSION['xoopsUserGroups'] = $xoopsUser->getGroups();
         }
+        if (isset($hash_login)) {   // only do during a 'remember me' login
+            $user_theme = $xoopsUser->getVar('theme');
+            if ($user_theme != $xoopsConfig['theme_set'] && in_array($user_theme, $xoopsConfig['theme_set_allowed'])) {
+                $_SESSION['xoopsUserTheme'] = $user_theme;
+            }
+        }
         $xoopsUserIsAdmin = $xoopsUser->isAdmin();
     }
 }