jenkins-bot has submitted this change and it was merged.
Change subject: Fix undefined variable in Status::getMessage()
......................................................................
Fix undefined variable in Status::getMessage()
If $shortContext and $longContext are false, and there
are errors, then $s is undefined.
Change-Id: Ie07f80b43a48a6fc4ed28b2c519f51fd32690bc8
---
M includes/Status.php
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Status.php b/includes/Status.php
index ab24201..928f8eb 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -238,8 +238,14 @@
}
} else {
$msgs = $this->getErrorMessageArray( $this->errors );
- $wrapper = new RawMessage( '* $' . implode( "\n* \$",
range( 1, count( $msgs ) + 1 ) ) );
- $wrapper->params( $msgs )->parse();
+ $msgCount = count( $msgs );
+
+ if ( $shortContext ) {
+ $msgCount++;
+ }
+
+ $wrapper = new RawMessage( '* $' . implode( "\n* \$",
range( 1, $msgCount ) ) );
+ $s = $wrapper->params( $msgs )->parse();
if ( $longContext ) {
$s = wfMessage( $longContext, $wrapper );
@@ -249,6 +255,7 @@
$s = wfMessage( $shortContext, $wrapper );
}
}
+
return $s;
}
--
To view, visit https://gerrit.wikimedia.org/r/91654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie07f80b43a48a6fc4ed28b2c519f51fd32690bc8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
