jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389752 )
Change subject: Fix mergeMessageFileList.php --extensions-dir extensions:skins
......................................................................
Fix mergeMessageFileList.php --extensions-dir extensions:skins
Only last directory of multiple was being used.
Follows up e74bc3b32effac7e0bbf9e314f4a6f15eedf7bff
Change-Id: I30190a30c387f1c34a41f9bbc033d421be631756
---
M maintenance/mergeMessageFileList.php
1 file changed, 21 insertions(+), 21 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/mergeMessageFileList.php
b/maintenance/mergeMessageFileList.php
index bb47631..8d2534e 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -80,29 +80,29 @@
$extdirs = explode( ':', $extdir );
$entries = [];
foreach ( $extdirs as $extdir ) {
- $entries = array_merge( $entries, scandir(
$extdir ) );
- }
- foreach ( $entries as $extname ) {
- if ( $extname == '.' || $extname == '..' ||
!is_dir( "$extdir/$extname" ) ) {
- continue;
- }
- $possibilities = [
- "$extdir/$extname/extension.json",
- "$extdir/$extname/skin.json",
- "$extdir/$extname/$extname.php"
- ];
- $found = false;
- foreach ( $possibilities as $extfile ) {
- if ( file_exists( $extfile ) ) {
- $mmfl['setupFiles'][] =
$extfile;
- $found = true;
- break;
+ $entries = scandir( $extdir );
+ foreach ( $entries as $extname ) {
+ if ( $extname == '.' || $extname ==
'..' || !is_dir( "$extdir/$extname" ) ) {
+ continue;
}
- }
+ $possibilities = [
+
"$extdir/$extname/extension.json",
+ "$extdir/$extname/skin.json",
+ "$extdir/$extname/$extname.php"
+ ];
+ $found = false;
+ foreach ( $possibilities as $extfile ) {
+ if ( file_exists( $extfile ) ) {
+ $mmfl['setupFiles'][] =
$extfile;
+ $found = true;
+ break;
+ }
+ }
- if ( !$found ) {
- $this->error( "Extension {$extname} in
{$extdir} lacks expected entry point: " .
- "extension.json, skin.json, or
{$extname}.php." );
+ if ( !$found ) {
+ $this->error( "Extension
{$extname} in {$extdir} lacks expected entry point: " .
+ "extension.json,
skin.json, or {$extname}.php." );
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/389752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30190a30c387f1c34a41f9bbc033d421be631756
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
