GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Don't try to pull up designs for non-existent users

Browse Source
This commit is contained in:
Zach Copley 2009-11-03 09:55:35 -08:00
parent 1e6aff69d6
commit d03a57853e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/api.php
View File

@ -134,11 +134,20 @@ class ApiAction extends Action
$twitter_user['protected'] = false; # not supported by StatusNet yet $twitter_user['protected'] = false; # not supported by StatusNet yet
$twitter_user['followers_count'] = $profile->subscriberCount(); $twitter_user['followers_count'] = $profile->subscriberCount();
// Need to pull up the user for some of this
$user = $profile->getUser();
$design = $user->getDesign();
$defaultDesign = Design::siteDesign(); $defaultDesign = Design::siteDesign();
if (!$design) $design = $defaultDesign; $design = null;
$user = $profile->getUser();
// Note: some profiles don't have an associated user
if (!empty($user)) {
$design = $user->getDesign();
}
if (empty($design)) {
$design = $defaultDesign;
}
$color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor); $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor);
$twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue(); $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue();
$color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor); $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor);