Merge "ApiHelp: Fix PHP notice when "wrap" parameter is provided"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 28 Oct 2014 15:15:55 +0000 (15:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Oct 2014 15:15:55 +0000 (15:15 +0000)
includes/api/ApiHelp.php

index 9be2d92..88a3df2 100644 (file)
@@ -60,7 +60,7 @@ class ApiHelp extends ApiBase {
                if ( $params['wrap'] ) {
                        $data = array(
                                'mime' => 'text/html',
-                               'help' => $help,
+                               'help' => $html,
                        );
                        $result->setSubelements( $data, 'help' );
                        $result->addValue( null, $this->getModuleName(), $data );