jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/260376 )
Change subject: Set $_SERVER['SERVER_NAME'] to the value set by --server ...................................................................... Set $_SERVER['SERVER_NAME'] to the value set by --server For wiki families that use the "Wikimedia Method" to have domain dependant wikis the server variable 'SERVER_NAME' might be used to get the database name. c.f. https://www.mediawiki.org/wiki/Manual:Wiki_family#Wikimedia_Method This change sets $_SERVER['SERVER_NAME'] to the commandline option passed as --server to enable the correct loading of the LocalSettings.php Change-Id: I7e5c009c2403f6c93e81422a8376d7deee4d2b5a --- M maintenance/Maintenance.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index 174b973..ec54993 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -1170,6 +1170,9 @@ "must exist and be readable in the source directory.\n" . "Use --conf to specify it.", true ); } + if ( isset( $this->mOptions['server'] ) ) { + $_SERVER['SERVER_NAME'] = $this->mOptions['server']; + } $wgCommandLineMode = true; return $settingsFile; -- To view, visit https://gerrit.wikimedia.org/r/260376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e5c009c2403f6c93e81422a8376d7deee4d2b5a Gerrit-PatchSet: 7 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Physikerwelt <w...@physikerwelt.de> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
