jenkins-bot has submitted this change and it was merged.
Change subject: Don't require hook subscribers to know language direction
......................................................................
Don't require hook subscribers to know language direction
Allows extensions to pass the screenshot image as an array with
'ltr' and 'rtl' keys if the image differs across layouts.
This will prevent some of the recursion that occurs when calling
->getLanguage() on RequestContext::getMain().
Bug: 62124
Change-Id: I1c72aaa3f847b1b7679113f2b88cbb92adf0f936
---
M includes/HTMLFeatureField.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/HTMLFeatureField.php b/includes/HTMLFeatureField.php
index cee7d16..8066d9a 100644
--- a/includes/HTMLFeatureField.php
+++ b/includes/HTMLFeatureField.php
@@ -228,8 +228,14 @@
) );
if ( isset( $this->mParams['screenshot'] ) ) {
+ if ( is_array( $this->mParams['screenshot'] ) ) {
+ // Array will have 'ltr' and 'rtl' keys
+ $screenshot =
$this->mParams['screenshot'][$this->mParent->getLanguage()->getDir()];
+ } else {
+ $screenshot = $this->mParams['screenshot'];
+ }
$html .= Html::element( 'img', array(
- 'src' => $this->mParams['screenshot'],
+ 'src' => $screenshot,
'class' => 'mw-ui-feature-screenshot',
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/118963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c72aaa3f847b1b7679113f2b88cbb92adf0f936
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
