jenkins-bot has submitted this change and it was merged.
Change subject: Conditionally include the home directory in config search
......................................................................
Conditionally include the home directory in config search
Change-Id: I31a90fd797c203c7dfd12e38a153ee8e05bab7d3
---
M Core/Configuration.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Core/Configuration.php b/Core/Configuration.php
index 6b6c18b..815006a 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -57,8 +57,11 @@
$searchPath = array(
__DIR__ . '/../SmashPig.yaml',
'/etc/fundraising/SmashPig.yaml',
- $_SERVER['HOME'] . '/.fundraising/SmashPig.yaml',
);
+ if ( isset( $_SERVER['HOME'] ) ) {
+ // FIXME: But I don't understand why this key is
missing during testing.
+ $searchPath[] = $_SERVER['HOME'] .
'/.fundraising/SmashPig.yaml';
+ }
if ( $overridePath ) {
$searchPath[] = $overridePath;
}
--
To view, visit https://gerrit.wikimedia.org/r/300208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31a90fd797c203c7dfd12e38a153ee8e05bab7d3
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Eileen <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Pcoombe <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
