merge from testing

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

diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index ac1bb1a5b3a0581e9be0634023d490584c5648dc..e4ef55f2e397f4f353d0d956375afdb3dda42471 100644 (file)
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @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,12 +39,13 @@ require_once INSTALLDIR . '/lib/api.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @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/
  */
 
-class ApiHelpTestAction extends TwitterApiAction
+class ApiHelpTestAction extends ApiAction
 {
 
     /**
@@ -74,13 +76,13 @@ class ApiHelpTestAction extends TwitterApiAction
         parent::handle($args);
 
         if ($this->format == 'xml') {
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->element('ok', null, 'true');
-            $this->end_document('xml');
+            $this->endDocument('xml');
         } elseif ($this->format == 'json') {
-            $this->init_document('json');
+            $this->initDocument('json');
             print '"ok"';
-            $this->end_document('json');
+            $this->endDocument('json');
         } else {
             $this->clientError(
                 _('API method not found!'),