diff options
| author | Zach Copley <zach@status.net> | 2010-01-13 19:17:49 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-01-13 19:17:49 +0000 |
| commit | c3188fd1fece2be7f7c4211d28f4a3d3a59c8fa1 (patch) | |
| tree | aa8018e132936b00fc63224e75ca134d68999b4e /lib/api.php | |
| parent | 43170b3d18153b3dfd8675bd77ae1133eed8148a (diff) | |
| parent | 0e1f2d4b47e5e340679c4245b62e1d64c6b9c9b9 (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; } |