aboutsummaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>2014-10-28 15:15:55 +0000
committerGerrit Code Review <gerrit@wikimedia.org>2014-10-28 15:15:55 +0000
commit0cde9bc48ced321fadd0992e119779c4f4ae76ca (patch)
treee48ae3f2871a65ce9845abc8276ba688eee7e1d0 /includes
parent0d750d533f5008782bfd3f47c30d2e1dc15c611d (diff)
parente241959c0de68bf76b673558120f77a474c6119e (diff)
downloadmediawikicore-0cde9bc48ced321fadd0992e119779c4f4ae76ca.tar.gz
mediawikicore-0cde9bc48ced321fadd0992e119779c4f4ae76ca.zip
Merge "ApiHelp: Fix PHP notice when "wrap" parameter is provided"
Diffstat (limited to 'includes')
-rw-r--r--includes/api/ApiHelp.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 9be2d92b2a36..88a3df2fae21 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -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 );