diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-14 07:15:57 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-14 07:15:57 +0100 |
| commit | 30551b24ec833ef58e98071e56cb3bb94f302dd3 (patch) | |
| tree | 3d33a24a2be14e043b08ae7cbb8c21de8ddf16da /include/auth.php | |
| parent | c472799b8dd607946c0bf787240ba4df7fd28e93 (diff) | |
| parent | 5bfb0ba4c2ee23366651e1e38d3964098f99f5cf (diff) | |
| download | volse-hubzilla-30551b24ec833ef58e98071e56cb3bb94f302dd3.tar.gz volse-hubzilla-30551b24ec833ef58e98071e56cb3bb94f302dd3.tar.bz2 volse-hubzilla-30551b24ec833ef58e98071e56cb3bb94f302dd3.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/auth.php')
| -rw-r--r-- | include/auth.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/auth.php b/include/auth.php index d2bcb68dc..a0244571b 100644 --- a/include/auth.php +++ b/include/auth.php @@ -53,8 +53,11 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p $a->user = $r[0]; $_SESSION['theme'] = $a->user['theme']; $_SESSION['page_flags'] = $a->user['page-flags']; - if(strlen($a->user['timezone'])) + + if(strlen($a->user['timezone'])) { date_default_timezone_set($a->user['timezone']); + $a->timezone = $a->user['timezone']; + } $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname']; @@ -183,8 +186,11 @@ else { notice( t("Welcome back ") . $record['username'] . EOL); $a->user = $record; - if(strlen($a->user['timezone'])) + + if(strlen($a->user['timezone'])) { date_default_timezone_set($a->user['timezone']); + $a->timezone = $a->user['timezone']; + } $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); |