From 4881be47c798688c3ae20f621d06e15adbc9c17e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 4 Dec 2009 22:40:07 +0000 Subject: [PATCH] Don't depend on a User being available when looking up Design and timezone for a profile (because some profiles are remote, etc.) --- lib/api.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/api.php b/lib/api.php index 5a3bb5ee45..eacb80dbea 100644 --- a/lib/api.php +++ b/lib/api.php @@ -134,19 +134,17 @@ class ApiAction extends Action $twitter_user['protected'] = false; # not supported by StatusNet yet $twitter_user['followers_count'] = $profile->subscriberCount(); - $design = null; $user = $profile->getUser(); + $design = null; // Note: some profiles don't have an associated user + $defaultDesign = Design::siteDesign(); + if (!empty($user)) { $design = $user->getDesign(); } - if (empty($design)) { - $design = Design::siteDesign(); - } - $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor); $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue(); $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor); @@ -165,7 +163,7 @@ class ApiAction extends Action $timezone = 'UTC'; - if ($user->timezone) { + if (!empty($user) && !empty($user->timezone)) { $timezone = $user->timezone; } -- 2.39.5