diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2010-01-13 23:10:00 +0100 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2010-01-13 23:10:00 +0100 |
| commit | 108c51fa6859ec56269078ef9bd0459fdbd9b1ba (patch) | |
| tree | c45dc1036d80ba0fdc58473819cde12bcc03eb32 /lib/api.php | |
| parent | f7f82982ec9a8671195efdc278c2987aa92c083c (diff) | |
| parent | 25ed2d2c872e59fd99b54fdf0dec1ca448feca00 (diff) | |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
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; } |