From 168b5730e070df508b6779bef1c88998cf276518 Mon Sep 17 00:00:00 2001 From: CosmicAlpha Date: Thu, 18 Jul 2024 07:27:09 +0800 Subject: [PATCH] GlobalSettings: remove version checks --- GlobalSettings.php | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/GlobalSettings.php b/GlobalSettings.php index 1c45a4cf3b..a5c46032ed 100644 --- a/GlobalSettings.php +++ b/GlobalSettings.php @@ -42,11 +42,9 @@ 'RemovePII', ] ); - if ( $wi->version >= '1.42' ) { - $wgVirtualDomainsMapping['virtual-centralauth'] = [ 'db' => $wi->getGlobalDatabase() ]; - $wgVirtualDomainsMapping['virtual-globalblocking'] = [ 'db' => $wi->getGlobalDatabase() ]; - $wgVirtualDomainsMapping['virtual-oathauth'] = [ 'db' => $wi->getGlobalDatabase() ]; - } + $wgVirtualDomainsMapping['virtual-centralauth'] = [ 'db' => $wi->getGlobalDatabase() ]; + $wgVirtualDomainsMapping['virtual-globalblocking'] = [ 'db' => $wi->getGlobalDatabase() ]; + $wgVirtualDomainsMapping['virtual-oathauth'] = [ 'db' => $wi->getGlobalDatabase() ]; // Only allow users with global accounts to login $wgCentralAuthStrict = true; @@ -56,17 +54,11 @@ } $wgPasswordConfig['null'] = [ 'class' => InvalidPassword::class ]; +} else { + $wgVirtualDomainsMapping['virtual-oathauth'] = [ 'db' => 'ldapwikiwiki' ]; } -if ( $wi->version >= '1.42' ) { - $wgVirtualDomainsMapping['virtual-importdump'] = [ 'db' => $wi->getCentralDatabase() ]; -} - -if ( $wi->dbname === 'ldapwikiwiki' || $wi->dbname === 'srewiki' ) { - if ( $wi->version >= '1.42' ) { - $wgVirtualDomainsMapping['virtual-oathauth'] = [ 'db' => 'ldapwikiwiki' ]; - } -} +$wgVirtualDomainsMapping['virtual-importdump'] = [ 'db' => $wi->getCentralDatabase() ]; if ( $wi->isExtensionActive( 'chameleon' ) ) { wfLoadExtension( 'Bootstrap' );