wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes issue #4

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-01-24 13:58:57 +01:00
parent 889305d8eb
commit a47ea60100
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
actions/apiexternalusershow.php
View File

@ -119,24 +119,6 @@ class ApiExternalUserShowAction extends ApiPrivateAuthAction
return true;
}
// if we don't know about this user, or the user has changed nickname
// if profile url ends with '/' this is probably an unknown single user instance
if(substr($profileurl, -1)==='/') {
$instanceurl = $profileurl;
$user_id_or_nickname = 1;
}
// multi user instance
else {
$user_id_or_nickname = substr($profileurl, strrpos($profileurl, '/')+1);
$instanceurl = substr($profileurl, 0, strrpos($profileurl, '/'));
}
$external_profile = $this->getProfileFromExternalInstance($instanceurl,$user_id_or_nickname);
if(!isset($external_profile->statusnet_profile_url)) {
return true;
}
$this->profile->external = $external_profile;
return true;
}
@ -154,9 +136,13 @@ class ApiExternalUserShowAction extends ApiPrivateAuthAction
{
parent::handle();
$this->initDocument('json');
$this->showJsonObjects($this->profile);
$this->endDocument('json');
if(is_null($this->profile->local) && is_null($this->profile->external)) {
$this->clientError(_('List not found.'), 404);
} else {
$this->initDocument('json');
$this->showJsonObjects($this->profile);
$this->endDocument('json');
}
}
/**