diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
commit | ca489631db840e33757a71a7e4cb56b187c182d3 (patch) | |
tree | 92c71b81b6870a8fd2d9c94bed8571b653d95413 /lib/apiauth.php | |
parent | 90c87553ee7566593529199374215ae80bb3e209 (diff) | |
parent | 01637bcd32921d6857fb7f5c0bbd40fba6bdb830 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
Diffstat (limited to 'lib/apiauth.php')
-rw-r--r-- | lib/apiauth.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/apiauth.php b/lib/apiauth.php index a1c698bba..1dacf1409 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -178,8 +178,10 @@ class ApiAuthAction extends ApiAction } // set the source attr + if ($app->name != 'anonymous') { + $this->source = $app->name; + } - $this->source = $app->name; $appUser = Oauth_application_user::staticGet('token', $access_token); @@ -261,7 +263,7 @@ class ApiAuthAction extends ApiAction // show error if the user clicks 'cancel' // TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel". - $this->clientError(_("Could not authenticate you."), 401, $this->format); + $this->clientError(_('Could not authenticate you.'), 401, $this->format); exit; } else { @@ -288,7 +290,7 @@ class ApiAuthAction extends ApiAction ); $this->logAuthFailure($msg); // TRANS: Client error thrown when authentication fails. - $this->clientError(_("Could not authenticate you."), 401, $this->format); + $this->clientError(_('Could not authenticate you.'), 401, $this->format); exit; } } @@ -340,7 +342,6 @@ class ApiAuthAction extends ApiAction * * @param string $logMsg additional log message */ - function logAuthFailure($logMsg) { list($proxy, $ip) = common_client_ip(); |