Merge "Add support for PHP7 random_bytes in favor of mcrypt_create_iv"

[lhc/web/wiklou.git] / includes / specials / SpecialApiHelp.php

diff --git a/includes/specials/SpecialApiHelp.php b/includes/specials/SpecialApiHelp.php
index b43911f..5448013 100644 (file)
--- a/includes/specials/SpecialApiHelp.php
+++ b/includes/specials/SpecialApiHelp.php
@@ -39,13 +39,13 @@ class SpecialApiHelp extends UnlistedSpecialPage {
 
                // These come from transclusions
                $request = $this->getRequest();
-               $options = array(
+               $options = [
                        'action' => 'help',
                        'nolead' => true,
                        'submodules' => $request->getCheck( 'submodules' ),
                        'recursivesubmodules' => $request->getCheck( 'recursivesubmodules' ),
                        'title' => $request->getVal( 'title', $this->getPageTitle( '$1' )->getPrefixedText() ),
-               );
+               ];
 
                // These are for linking from wikitext, since url parameters are a pain
                // to do.
@@ -77,8 +77,13 @@ class SpecialApiHelp extends UnlistedSpecialPage {
                $main = new ApiMain( $this->getContext(), false );
                try {
                        $module = $main->getModuleFromPath( $moduleName );
+               } catch ( ApiUsageException $ex ) {
+                       $this->getOutput()->addHTML( Html::rawElement( 'span', [ 'class' => 'error' ],
+                               $this->msg( 'apihelp-no-such-module', $moduleName )->inContentLanguage()->parse()
+                       ) );
+                       return;
                } catch ( UsageException $ex ) {
-                       $this->getOutput()->addHTML( Html::rawElement( 'span', array( 'class' => 'error' ),
+                       $this->getOutput()->addHTML( Html::rawElement( 'span', [ 'class' => 'error' ],
                                $this->msg( 'apihelp-no-such-module', $moduleName )->inContentLanguage()->parse()
                        ) );
                        return;