Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/302093
Change subject: Various minor improvements when used as a simple MediaWiki
extension
......................................................................
Various minor improvements when used as a simple MediaWiki extension
- Added .gitignore in config/ subdirectory to improve discovery of this
directory
- Typo in extension.json
- Avoid to redefine MW_CONFIG_FILE, particularly given it is useless
- Avoid PHP notice in a race case
Change-Id: If9390be51eb63fbff13977d0799bbf0f728cb26d
---
M .gitignore
A config/.gitignore
M extension.json
M src/MediaWikiFarm.php
4 files changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm
refs/changes/93/302093/1
diff --git a/.gitignore b/.gitignore
index baf509b..f3b03ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,4 @@
/vendor
# Installation
-/config
/www
diff --git a/config/.gitignore b/config/.gitignore
new file mode 100644
index 0000000..207cc9a
--- /dev/null
+++ b/config/.gitignore
@@ -0,0 +1,13 @@
+# Expected configuration files for a multiversion installation
+# See docs/config for samples
+
+# If you want to change any of the two configuration parameters
+/MediaWikiFarmDirectories.php
+
+# Main config file if this directory is the main configuration directory
+/farms.yml
+/farms.json
+/farms.php
+
+# Other config files can have any name
+*
diff --git a/extension.json b/extension.json
index d3d1eaa..0bc62e5 100644
--- a/extension.json
+++ b/extension.json
@@ -22,7 +22,7 @@
]
},
"AutoloadClasses": {
- "MediaWikiFarms": "src/MediaWikiFarm.php"
+ "MediaWikiFarm": "src/MediaWikiFarm.php"
},
"manifest_version": 1
}
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 4a90544..e8d8de7 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -88,7 +88,8 @@
#define( 'MW_CONFIG_CALLBACK', 'MediaWikiFarm::loadConfig' );
# Define config file to avoid creating a stub LocalSettings.php
- define( 'MW_CONFIG_FILE', $wgMediaWikiFarm->getConfigFile() );
+ if( !defined( 'MW_CONFIG_FILE' ) )
+ define( 'MW_CONFIG_FILE',
$wgMediaWikiFarm->getConfigFile() );
return $entryPoint;
}
@@ -163,7 +164,7 @@
if( $this->unusable )
return;
- if( !is_array( $this->params['globals'] ) )
+ if( !array_key_exists( 'globals', $this->params ) || !is_array(
$this->params['globals'] ) )
$this->getMediaWikiConfig();
// Set general parameters as global variables
@@ -1181,4 +1182,3 @@
return $out;
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/302093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9390be51eb63fbff13977d0799bbf0f728cb26d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
