diff options
| author | Zach Copley <zach@status.net> | 2010-10-21 01:18:53 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-10-21 01:18:53 +0000 |
| commit | 500157998a0d48ead7ea71f1cb77fc77c0ee7238 (patch) | |
| tree | 59de68c67a95f97d20192cf9d18cc35005a757c1 /lib/apioauthstore.php | |
| parent | f283a283b7101d95f7bed4558b37947f3c5b6951 (diff) | |
| parent | fb12094f616c52674b9a0a719fd78469ae60a6e6 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/apioauthstore.php')
| -rw-r--r-- | lib/apioauthstore.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php index e67b864af..2a65fffc4 100644 --- a/lib/apioauthstore.php +++ b/lib/apioauthstore.php @@ -48,7 +48,6 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore $app = Oauth_application::getByConsumerKey('anonymous'); if (!$app) { - common_debug("API OAuth - creating anonymous application"); $app = new OAuth_application(); $app->owner = 1; // XXX: What to do here? @@ -66,7 +65,7 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore $id = $app->insert(); if (!$id) { - // TRANS: Server error displayed when trying to create an anynymous OAuth application. + // TRANS: Server error displayed when trying to create an anynymous OAuth application. $this->serverError(_("Could not create anonymous OAuth application.")); } } @@ -148,6 +147,7 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore if (!$tokenAssoc) { throw new Exception( + // TRANS: Exception thrown when no token association could be found. _('Could not find a profile and application associated with the request token.') ); } @@ -182,6 +182,7 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore if (!$result) { throw new Exception( + // TRANS: Exception thrown when no access token can be issued. _('Could not issue access token.') ); } @@ -238,6 +239,7 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore if (!$result) { common_log_db_error($appUser, 'INSERT', __FILE__); + // TRANS: Server error displayed when a database error occurs. $this->serverError(_('Database error inserting OAuth application user.')); } |