Seb35 has submitted this change and it was merged. Change subject: Bug in detection of monoversion installation ......................................................................
Bug in detection of monoversion installation Change-Id: I4737ee1f7a1788452b5594f4bdc4a30cf0a00901 --- M www/api.php M www/img_auth.php M www/index.php M www/load.php M www/opensearch_desc.php 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Seb35: Verified; Looks good to me, approved diff --git a/www/api.php b/www/api.php index 250256a..cfe14c0 100644 --- a/www/api.php +++ b/www/api.php @@ -13,7 +13,7 @@ $wgMediaWikiFarmCacheDir = '/tmp/mw-cache'; # Check the entry point is installed in a multiversion MediaWiki farm or in the classical MediaWiki extensions directory -if( is_file( $wgMediaWikiFarmCodeDir . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; +if( is_file( dirname( $wgMediaWikiFarmCodeDir ) . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; # Override default MediaWikiFarm configuration @include_once dirname( dirname( __FILE__ ) ) . '/config/MediaWikiFarmDirectories.php'; diff --git a/www/img_auth.php b/www/img_auth.php index 72488b9..088e3e3 100644 --- a/www/img_auth.php +++ b/www/img_auth.php @@ -13,7 +13,7 @@ $wgMediaWikiFarmCacheDir = '/tmp/mw-cache'; # Check the entry point is installed in a multiversion MediaWiki farm or in the classical MediaWiki extensions directory -if( is_file( $wgMediaWikiFarmCodeDir . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; +if( is_file( dirname( $wgMediaWikiFarmCodeDir ) . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; # Override default MediaWikiFarm configuration @include_once dirname( dirname( __FILE__ ) ) . '/config/MediaWikiFarmDirectories.php'; diff --git a/www/index.php b/www/index.php index 2c7d025..a6e9d18 100644 --- a/www/index.php +++ b/www/index.php @@ -13,7 +13,7 @@ $wgMediaWikiFarmCacheDir = '/tmp/mw-cache'; # Check the entry point is installed in a multiversion MediaWiki farm or in the classical MediaWiki extensions directory -if( is_file( $wgMediaWikiFarmCodeDir . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; +if( is_file( dirname( $wgMediaWikiFarmCodeDir ) . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; # Override default MediaWikiFarm configuration @include_once dirname( dirname( __FILE__ ) ) . '/config/MediaWikiFarmDirectories.php'; diff --git a/www/load.php b/www/load.php index 03e496b..05bf906 100644 --- a/www/load.php +++ b/www/load.php @@ -13,7 +13,7 @@ $wgMediaWikiFarmCacheDir = '/tmp/mw-cache'; # Check the entry point is installed in a multiversion MediaWiki farm or in the classical MediaWiki extensions directory -if( is_file( $wgMediaWikiFarmCodeDir . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; +if( is_file( dirname( $wgMediaWikiFarmCodeDir ) . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; # Override default MediaWikiFarm configuration @include_once dirname( dirname( __FILE__ ) ) . '/config/MediaWikiFarmDirectories.php'; diff --git a/www/opensearch_desc.php b/www/opensearch_desc.php index 07da0d1..6c6d808 100644 --- a/www/opensearch_desc.php +++ b/www/opensearch_desc.php @@ -13,7 +13,7 @@ $wgMediaWikiFarmCacheDir = '/tmp/mw-cache'; # Check the entry point is installed in a multiversion MediaWiki farm or in the classical MediaWiki extensions directory -if( is_file( $wgMediaWikiFarmCodeDir . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; +if( is_file( dirname( $wgMediaWikiFarmCodeDir ) . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'DefaultSettings.php' ) ) exit; # Override default MediaWikiFarm configuration @include_once dirname( dirname( __FILE__ ) ) . '/config/MediaWikiFarmDirectories.php'; -- To view, visit https://gerrit.wikimedia.org/r/304201 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4737ee1f7a1788452b5594f4bdc4a30cf0a00901 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiFarm Gerrit-Branch: master Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com> Gerrit-Reviewer: Seb35 <seb35wikipe...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
