eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'mgrdcm-review' into 0.7.x 

* mgrdcm-review:
  Bringing users/show in line with Twitter as far as specifying user.
This commit is contained in:
Zach Copley 2009-07-06 15:48:14 -07:00
parent ed21af0d1d 40e05a3e86
commit 701a237e8c
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actions/twitapiusers.php
View File

@ -35,20 +35,13 @@ class TwitapiusersAction extends TwitterapiAction
$user = null;
$email = $this->arg('email');
$user_id = $this->arg('user_id');
// XXX: email field deprecated in Twitter's API
// XXX: Also: need to add screen_name param
if ($email) {
$user = User::staticGet('email', $email);
} elseif ($user_id) {
$user = $this->get_user($user_id);
} elseif (isset($apidata['api_arg'])) {
} else {
$user = $this->get_user($apidata['api_arg']);
} elseif (isset($apidata['user'])) {
$user = $apidata['user'];
}
if (!$user) {