[MediaWiki-commits] [Gerrit] Display the required skins - change (mediawiki...BetaFeatures)

[jenkins-bot (Code Review)]

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

Change subject: Display the required skins
..


Display the required skins

By using the keys (lowercase names of the skins) instead of the values
(CamelCase names of the skins) resulting from Skin::getAllowedSkins()

Bug: 70814
Change-Id: Ic4f337d5d9bef79689f01b30f473597fa6e0442c
---
M BetaFeaturesHooks.php
M resources/betafeatures.less
2 files changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/BetaFeaturesHooks.php b/BetaFeaturesHooks.php
index 1bd169c..4f40363 100644
--- a/BetaFeaturesHooks.php
+++ b/BetaFeaturesHooks.php
@@ -288,7 +288,7 @@
// Remove any skins that aren't 
installed or users can't choose
$prefs[$key]['requirements']['skins'] = 
array_intersect(

$prefs[$key]['requirements']['skins'],
-   Skin::getAllowedSkins()
+   array_keys( 
Skin::getAllowedSkins() )
);
 
if ( empty( 
$prefs[$key]['requirements']['skins'] ) ) {
diff --git a/resources/betafeatures.less b/resources/betafeatures.less
index 3229180..e9cdb0c 100644
--- a/resources/betafeatures.less
+++ b/resources/betafeatures.less
@@ -144,3 +144,7 @@
 .mw-ui-feature-requirements-list .mw-ui-feature-requirements-browser {
display: none;
 }
+
+.mw-ui-feature-requirements-list .mw-ui-feature-requirements-skins {
+   display: none;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4f337d5d9bef79689f01b30f473597fa6e0442c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Seb35 seb35wikipe...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Seb35 seb35wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Display the required skins - change (mediawiki...BetaFeatures)

[Seb35 (Code Review)]

Seb35 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/160213

Change subject: Display the required skins
..

Display the required skins

By using the keys (lowercase names of the skins) instead of the values
(CamelCase names of the skins) resulting from Skin::getAllowedSkins()

Bug: 70814
Change-Id: Ic4f337d5d9bef79689f01b30f473597fa6e0442c
---
M BetaFeaturesHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BetaFeatures 
refs/changes/13/160213/1

diff --git a/BetaFeaturesHooks.php b/BetaFeaturesHooks.php
index b5d389a..61a7233 100644
--- a/BetaFeaturesHooks.php
+++ b/BetaFeaturesHooks.php
@@ -286,7 +286,7 @@
// Remove any skins that aren't 
installed or users can't choose
$prefs[$key]['requirements']['skins'] = 
array_intersect(

$prefs[$key]['requirements']['skins'],
-   Skin::getAllowedSkins()
+   array_keys( 
Skin::getAllowedSkins() )
);
 
if ( empty( 
$prefs[$key]['requirements']['skins'] ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4f337d5d9bef79689f01b30f473597fa6e0442c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Seb35 seb35wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits