]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Fix issue with OAuth request parameters being parsed/stored twice when
authorZach Copley <zach@status.net>
Fri, 5 Feb 2010 01:13:23 +0000 (01:13 +0000)
committerZach Copley <zach@status.net>
Fri, 5 Feb 2010 02:09:50 +0000 (02:09 +0000)
calling /api/account/verify_credentials.:format

actions/apiaccountverifycredentials.php

index 1095d5162634f312772ce78e4e533dc2a2eaf00a..ea61a3205945c12f3c10afc62ecbef0e31c3e08b 100644 (file)
@@ -66,18 +66,21 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
     {
         parent::handle($args);
 
-        switch ($this->format) {
-        case 'xml':
-        case 'json':
-            $args['id'] = $this->auth_user->id;
-            $action_obj = new ApiUserShowAction();
-            if ($action_obj->prepare($args)) {
-                $action_obj->handle($args);
-            }
-            break;
-        default:
-            header('Content-Type: text/html; charset=utf-8');
-            print 'Authorized';
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(_('API method not found.'), $code = 404);
+            return;
+        }
+
+        $twitter_user = $this->twitterUserArray($this->auth_user->getProfile(), true);
+
+        if ($this->format == 'xml') {
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
+        } elseif ($this->format == 'json') {
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
         }
 
     }
@@ -86,14 +89,14 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
      * Is this action read only?
      *
      * @param array $args other arguments
-     * 
+     *
      * @return boolean true
      *
      **/
-    
+
     function isReadOnly($args)
     {
         return true;
     }
-    
+
 }