Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / actions / apigroupismember.php

diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 02079b6ffefa578c81acf20d67def1ea706c7e88..a8a40a6b3ba37a39dd61e8842f649bb5c5bf2b78 100644 (file)
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +41,9 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -45,8 +51,6 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
 
 class ApiGroupIsMemberAction extends ApiBareAuthAction
 {
-    var $format  = null;
-    var $user    = null;
     var $group   = null;
 
     /**
@@ -64,7 +68,6 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
 
         $this->user   = $this->getTargetUser(null);
         $this->group  = $this->getTargetGroup(null);
-        $this->format = $this->arg('format');
 
         return true;
     }
@@ -97,14 +100,14 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->element('is_member', null, $is_member);
-            $this->end_document('xml');
+            $this->endDocument('xml');
             break;
         case 'json':
-            $this->init_document('json');
-            $this->show_json_objects(array('is_member' => $is_member));
-            $this->end_document('json');
+            $this->initDocument('json');
+            $this->showJsonObjects(array('is_member' => $is_member));
+            $this->endDocument('json');
             break;
         default:
             $this->clientError(