Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299413
Change subject: Documentation
......................................................................
Documentation
---
M MediaWikiFarm.php
M docs/config/LocalSettings.multiversion.php
M src/MediaWikiFarm.php
3 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm
refs/changes/13/299413/1
diff --git a/MediaWikiFarm.php b/MediaWikiFarm.php
index 7e0c71f..6f59fef 100644
--- a/MediaWikiFarm.php
+++ b/MediaWikiFarm.php
@@ -23,6 +23,6 @@
MediaWikiFarm::load();
# Load MediaWiki configuration
- require_once MediaWikiFarm::getInstance()->loadConfigDirectory();
+ require_once MediaWikiFarm::getInstance()->getConfigFile();
}
diff --git a/docs/config/LocalSettings.multiversion.php
b/docs/config/LocalSettings.multiversion.php
index 40e6cb0..a3676a5 100644
--- a/docs/config/LocalSettings.multiversion.php
+++ b/docs/config/LocalSettings.multiversion.php
@@ -7,7 +7,7 @@
if( !defined( 'MEDIAWIKI' ) ) exit;
# Include the code.
-require_once MediaWikiFarm::getInstance()->loadConfigDirectory();
+require_once MediaWikiFarm::getInstance()->getConfigFile();
# Do not add other configuration here, but instead in the config files
# read by MediaWikiFarm -- even for global settings.
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 6ccb7b6..f3deeeb 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -237,7 +237,17 @@
}
}
- function loadConfigDirectory() {
+ /**
+ * Return the file where is loaded the configuration.
+ *
+ * This function is important to avoid the two parts of the extension
(checking of
+ * existence and loading of configuration) are located in the same
directory in the
+ * case mono- and multi-version installations are mixed. Without it,
this class
+ * could be defined by two different files, and PHP doesn’t like it.
+ *
+ * @return string File where is loaded the configuration.
+ */
+ function getConfigFile() {
return $this->farmDir . '/src/main.php';
}
--
To view, visit https://gerrit.wikimedia.org/r/299413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide5bb6197d2c50868ca71cfc45d7ff4db3a74313
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
