jenkins-bot has submitted this change and it was merged.

Change subject: ApiHelp: Fix PHP notice when "wrap" parameter is provided
......................................................................


ApiHelp: Fix PHP notice when "wrap" parameter is provided

An incorrect variable name was used, so the "help" property of
the "help" object in the output was merely encoded as null.

Change-Id: Ia1a8c8ad4515e216998d4975aad3555f87d24380
---
M includes/api/ApiHelp.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Anomie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 9be2d92..88a3df2 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -60,7 +60,7 @@
                if ( $params['wrap'] ) {
                        $data = array(
                                'mime' => 'text/html',
-                               'help' => $help,
+                               'help' => $html,
                        );
                        $result->setSubelements( $data, 'help' );
                        $result->addValue( null, $this->getModuleName(), $data 
);

-- 
To view, visit https://gerrit.wikimedia.org/r/169323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1a8c8ad4515e216998d4975aad3555f87d24380
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: PleaseStand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to