From 5ccf3ed71497ffd02d8aac906e0a11d07e1cdefd Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 18 Apr 2016 15:21:05 +0200 Subject: [PATCH] function declaration to match parent --- actions/apihelptest.php | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/actions/apihelptest.php b/actions/apihelptest.php index a9cd7394c9..e57ebb710f 100644 --- a/actions/apihelptest.php +++ b/actions/apihelptest.php @@ -28,9 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * Returns the string "ok" in the requested format with a 200 OK HTTP status code. @@ -44,29 +42,9 @@ if (!defined('STATUSNET')) { */ class ApiHelpTestAction extends ApiPrivateAuthAction { - /** - * Take arguments for running - * - * @param array $args $_REQUEST args - * - * @return boolean success flag - */ - function prepare($args) - { - parent::prepare($args); - return true; - } - - /** - * Handle the request - * - * @param array $args $_REQUEST data (unused) - * - * @return void - */ - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); if ($this->format == 'xml') { $this->initDocument('xml'); @@ -77,12 +55,8 @@ class ApiHelpTestAction extends ApiPrivateAuthAction print '"ok"'; $this->endDocument('json'); } else { - $this->clientError( - // TRANS: Client error displayed when coming across a non-supported API method. - _('API method not found.'), - 404, - $this->format - ); + // TRANS: Client error displayed when coming across a non-supported API method. + throw new ClientException(_('API method not found.'), 404); } } -- 2.39.5