diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-12 23:53:52 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-12 23:53:52 -0800 |
| commit | 436b8c845ea8fcc84f7f2bff71a7fa700d262a01 (patch) | |
| tree | e81b78c2022ca0770d71c3c3a7980d02a24a2a51 /lib/api.php | |
| parent | fb0d837ddc572993f8c6d1db3de2c96d70101841 (diff) | |
| parent | e34ece8b0630394b606b57b19de58c830fad9c4d (diff) | |
Merge branch '0.9.x' into inblob
Diffstat (limited to 'lib/api.php')
| -rw-r--r-- | lib/api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api.php b/lib/api.php index d21851d50..707e4ac21 100644 --- a/lib/api.php +++ b/lib/api.php @@ -168,7 +168,7 @@ class ApiAction extends Action $timezone = 'UTC'; - if ($user->timezone) { + if (!empty($user) && $user->timezone) { $timezone = $user->timezone; } |