Followup r92396 rename method, fix boolean comparison that was supposed to be inverte...

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 360efda..ff005ee 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -268,7 +268,7 @@ abstract class ApiBase {
                        }
 
                        $msg .= $this->makeHelpArrayToString( $lnPrfx, "Example", $this->getExamples() );
-                       $msg .= $this->makeHelpArrayToString( $lnPrfx, "Help page", $this->getHelpUrl() );
+                       $msg .= $this->makeHelpArrayToString( $lnPrfx, "Help page", $this->getHelpUrls() );
 
                        if ( $this->getMain()->getShowVersions() ) {
                                $versions = $this->getVersion();
@@ -298,7 +298,7 @@ abstract class ApiBase {
         * @return string
         */
        protected function makeHelpArrayToString( $prefix, $title, $input ) {
-               if ( $input !== false ) {
+               if ( $input === false ) {
                        return '';
                }
                if ( !is_array( $input ) ) {
@@ -1311,7 +1311,7 @@ abstract class ApiBase {
        /**
         * @return false|string|array Returns a false if the module has no help url, else returns a (array of) string
         */
-       public function getHelpUrl() {
+       public function getHelpUrls() {
                return false;
        }
 

diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index cf0666c..8e68042 100644 (file)
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -212,7 +212,7 @@ class ApiLogin extends ApiBase {
                );
        }
 
-       public function getHelpUrl() {
+       public function getHelpUrls() {
                return 'http://www.mediawiki.org/wiki/API:Login';
        }
 

diff --git a/includes/api/ApiLogout.php b/includes/api/ApiLogout.php
index 9921c0d..dd94b9b 100644 (file)
--- a/includes/api/ApiLogout.php
+++ b/includes/api/ApiLogout.php
@@ -73,7 +73,7 @@ class ApiLogout extends ApiBase {
                );
        }
 
-       public function getHelpUrl() {
+       public function getHelpUrls() {
                return 'http://www.mediawiki.org/wiki/API:Logout';
        }
 

diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 323c36f..989e55b 100644 (file)
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -94,7 +94,7 @@ class ApiParamInfo extends ApiBase {
                $retval['classname'] = get_class( $obj );
                $retval['description'] = implode( "\n", (array)$obj->getDescription() );
                $retval['examples'] = implode( "\n", (array)$obj->getExamples() );
-               $retval['helpurl'] = implode( "\n", (array)$obj->getHelpUrl() );
+               $retval['helpurl'] = implode( "\n", (array)$obj->getHelpUrls() );
                $retval['version'] = implode( "\n", (array)$obj->getVersion() );
                $retval['prefix'] = $obj->getModulePrefix();
 
@@ -239,7 +239,7 @@ class ApiParamInfo extends ApiBase {
                );
        }
 
-       public function getHelpUrl() {
+       public function getHelpUrls() {
                return 'http://www.mediawiki.org/wiki/API:Parameter_information';
        }
 

diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 66b196b..61f1892 100644 (file)
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -702,7 +702,7 @@ class ApiQuery extends ApiBase {
                );
        }
 
-       public function getHelpUrl() {
+       public function getHelpUrls() {
                return array(
                        'http://www.mediawiki.org/wiki/API:Meta',
                        'http://www.mediawiki.org/wiki/API:Properties',