From 0f8b902004dc7245a56307ed69c766d949f06dc3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 8 Jan 2009 16:15:08 -0500 Subject: Revert "Twitter-compatible API - update verify_credentials to return profile" This reverts commit b801f73b1f4706f15783f91fd07508a03175592d. Twhirl assumes we return the old kind of results, so we have to do that. --- actions/api.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'actions/api.php') diff --git a/actions/api.php b/actions/api.php index 919a515ce..ccebcd89e 100644 --- a/actions/api.php +++ b/actions/api.php @@ -47,7 +47,7 @@ class ApiAction extends Action { $this->content_type = strtolower($cmdext[1]); } - if ($this->requires_auth()) { + if($this->requires_auth()) { if (!isset($_SERVER['PHP_AUTH_USER'])) { # This header makes basic auth go @@ -70,9 +70,13 @@ class ApiAction extends Action { } } else { - # Look for the user in the session - if (common_logged_in()) { - $this->user = common_current_user(); + # Caller might give us a username even if not required + if (isset($_SERVER['PHP_AUTH_USER'])) { + $user = User::staticGet('nickname', $_SERVER['PHP_AUTH_USER']); + if ($user) { + $this->user = $user; + } + # Twitter doesn't throw an error if the user isn't found } $this->process_command(); -- cgit v1.2.3-54-g00ecf