Merge branch 'admin-sections/4' into 0.9.x

[quix0rs-gnu-social.git] / lib / apiauth.php

diff --git a/lib/apiauth.php b/lib/apiauth.php
index 2a337701326ef4fe0e8cbde671ec537e7aba230e..0d1613d381ed17de89be5410b47e1b7df2f04637 100644 (file)
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -66,7 +66,6 @@ class ApiAuthAction extends ApiAction
 
     function prepare($args)
     {
-        common_debug('ApiAction::prepare()');
         parent::prepare($args);
 
         if ($this->requiresAuth()) {
@@ -111,7 +110,11 @@ class ApiAuthAction extends ApiAction
         } else {
             $nickname = $this->auth_user;
             $password = $this->auth_pw;
-            $this->auth_user = common_check_user($nickname, $password);
+            $user = common_check_user($nickname, $password);
+            if (Event::handle('StartSetApiUser', array(&$user))) {
+                $this->auth_user = $user;
+                Event::handle('EndSetApiUser', array($user));
+            }
 
             if (empty($this->auth_user)) {