jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Add version hash to screenshot urls"
......................................................................
Revert "Add version hash to screenshot urls"
PHP Warning: strpos() expects parameter 1 to be string, array given.
It contains an array keyed by language code or language direction.
The hash must apply to its values, not the array itself.
Should probably be moved to HTMLFeatureField.
This reverts commit 57f974cb50565571b5aba12b1c1496d87042a97c.
Change-Id: Ia39dc54099b2a0ab3a670402b85f534142f3f466
---
M BetaFeaturesHooks.php
1 file changed, 2 insertions(+), 10 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BetaFeaturesHooks.php b/BetaFeaturesHooks.php
index 33b4253..df44cc3 100644
--- a/BetaFeaturesHooks.php
+++ b/BetaFeaturesHooks.php
@@ -104,7 +104,6 @@
public static function getPreferences( User $user, array &$prefs ) {
global $wgBetaFeaturesWhitelist, $wgBetaFeatures;
- $config = ConfigFactory::getDefaultInstance()->makeConfig(
'main' );
$betaPrefs = $wgBetaFeatures;
$depHooks = array();
@@ -177,7 +176,7 @@
'section' => 'betafeatures',
);
- $fields = array(
+ $requiredFields = array(
'label-message' => true,
'desc-message' => true,
'screenshot' => false,
@@ -188,7 +187,7 @@
'discussion-message' => false,
);
- foreach ( $fields as $field => $required ) {
+ foreach ( $requiredFields as $field => $required ) {
if ( isset( $info[$field] ) ) {
$opt[$field] = $info[$field];
} elseif ( $required ) {
@@ -199,13 +198,6 @@
"The field {$field} was missing
from the beta feature {$key}."
);
}
- }
-
- if ( isset( $opt['screenshot'] ) ) {
- // Ensure image urls have a version hash.
- $opt['screenshot'] =
OutputPage::transformResourcePath( $config,
- $opt['screenshot']
- );
}
if ( isset( $counts[$key] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/275668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia39dc54099b2a0ab3a670402b85f534142f3f466
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
