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

Fix problem where screen_name and user_id parameters are being

Browse Source 
ignored due to the router sending in '[a-zA-Z0-9]+' for the id
parameter when no id is specified as part of the URL.
This commit is contained in:
Zach Copley 2009-11-30 13:08:55 -08:00
parent 792eb57c87
commit 234e6a10b1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/api.php
View File

@ -1142,15 +1142,10 @@ class ApiAction extends Action
function getTargetUser($id) function getTargetUser($id)
{ {
if (empty($id)) { if (!preg_match('/^[a-zA-Z0-9]+$/', $id)) {
// Twitter supports these other ways of passing the user ID // Twitter supports these other ways of passing the user ID
if (is_numeric($this->arg('id'))) { if ($this->arg('user_id')) {
return User::staticGet($this->arg('id'));
} else if ($this->arg('id')) {
$nickname = common_canonical_nickname($this->arg('id'));
return User::staticGet('nickname', $nickname);
} else if ($this->arg('user_id')) {
// This is to ensure that a non-numeric user_id still // This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used // overrides screen_name even if it doesn't get used
if (is_numeric($this->arg('user_id'))) { if (is_numeric($this->arg('user_id'))) {
@ -1159,6 +1154,12 @@ class ApiAction extends Action
} else if ($this->arg('screen_name')) { } else if ($this->arg('screen_name')) {
$nickname = common_canonical_nickname($this->arg('screen_name')); $nickname = common_canonical_nickname($this->arg('screen_name'));
return User::staticGet('nickname', $nickname); return User::staticGet('nickname', $nickname);
} else if (is_numeric($this->arg('id'))) {
return User::staticGet($this->arg('id'));
} else if ($this->arg('id')) {
$nickname = common_canonical_nickname($this->arg('id'));
return User::staticGet('nickname', $nickname);
} else { } else {
// Fall back to trying the currently authenticated user // Fall back to trying the currently authenticated user
return $this->auth_user; return $this->auth_user;