Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

Conflicts:

	lib/util.php

1 files changed, 15 insertions, 14 deletions

diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index b7c09cc9d..68a18cb57 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -23,23 +23,24 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapiaccountAction extends TwitterapiAction
 {
-
-	function verify_credentials($args, $apidata)
+    function verify_credentials($args, $apidata)
     {
+        parent::handle($args);
 
-		if ($apidata['content-type'] == 'xml') {
-			header('Content-Type: application/xml; charset=utf-8');
-			print '<authorized>true</authorized>';
-		} elseif ($apidata['content-type'] == 'json') {
-			header('Content-Type: application/json; charset=utf-8');
-			print '{"authorized":true}';
-		} else {
-			common_user_error(_('API method not found!'), $code=404);
-		}
-
-	}
+        switch ($apidata['content-type']) {
+        case 'xml':
+        case 'json':
+            $action_obj = new TwitapiusersAction();
+            $action_obj->prepare($args);
+            call_user_func(array($action_obj, 'show'), $args, $apidata);
+            break;
+        default:
+            header('Content-Type: text/html; charset=utf-8');
+            print 'Authorized';
+        }
+    }
 
-    function end_session($args, $apidata)
+   function end_session($args, $apidata)
     {
         parent::handle($args);
         $this->serverError(_('API method under construction.'), $code=501);