PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154442
Change subject: CommonSettings.php: Remove some dated cruft
......................................................................
CommonSettings.php: Remove some dated cruft
* Remove unnecessary and broken "Protection for unusual entry points".
* Don't try loading php_utfnormal.so using dl().
* Don't unnecessarily (since 1.17) include DefaultSettings.php or
set unused global variable $DP.
* Don't set $wgBlockOpenProxies (removed in 1.22, d7b953c25c59).
* Don't set obsolete profiling settings; current settings are
located in StartProfiler.php.
* Don't set $wgMaxIfExistCount (removed in r32932).
* Don't set $wgCategoryTreeDynamicTag (removed in daf3e2d9f1ae).
* On nostalgiawiki, don't set a default for the "highlightbroken"
user option (removed in 1.19, r111861 / c78f613b38a2).
* Don't set $wgUseHashTable, a long-obsolete setting.
* Remove commented-out values for $wgAntiLockFlags as well as
another obsolete flag: ALF_NO_BLOCK_LOCK (removed in r84336 /
f1b1aafa1d14).
* Don't set $wgCentralAuthSilentLogin (removed in 26e4affc9311)
or $wgCentralAuthUseOldAutoLogin (removed in efbdc700188f).
* Don't set $wgNoticeRunMessageIndexRebuildJobImmediately
(removed in 5d68f48e41ff).
* Don't set $wgUploadWizardConfig['disableResourceLoader'].
Change-Id: I03528ff360998aa16d85d9247a85513dff060acd
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/42/154442/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b7cc59c..c3952d3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -31,11 +31,6 @@
ini_set( 'error_append_string', ' (' . $_SERVER['SERVER_ADDR'] . ')' );
}
-# Protection for unusual entry points
-if ( !function_exists( 'wfProfileIn' ) ) {
- require( './includes/ProfilerStub.php' );
-}
-
$fname = 'CommonSettings.php';
wfProfileIn( $fname );
wfProfileIn( "$fname-init" );
@@ -51,10 +46,6 @@
$multiVersion = MWMultiVersion::getInstance();
set_include_path( "$IP:/usr/local/lib/php:/usr/share/php" );
-
-if ( getenv( 'WIKIBACKUP' ) && !function_exists( 'utf8_normalize' ) ) {
- dl( 'php_utfnormal.so' );
-}
### Determine realm and cluster we are on #############################
# $cluster is an historical variable used for the WMF MW conf
@@ -111,11 +102,6 @@
$wmfHostnames['wikidata'] = 'www.wikidata.org';
break;
}
-
-# Load site configuration
-include( "$IP/includes/DefaultSettings.php" );
-
-$DP = $IP;
wfProfileOut( "$fname-init" );
wfProfileIn( "$fname-host" );
@@ -451,18 +437,9 @@
require( getRealmSpecificFilename( "$wmfConfigDir/squid.php" ) );
-$wgBlockOpenProxies = false;
-
if( $wmfRealm == 'production' ) {
$wgUDPProfilerHost = '10.64.0.18'; // tungsten
$wgAggregateStatsID = $wgVersion;
-}
-
-// $wgProfiler is set in index.php
-if ( isset( $wgProfiler ) ) {
- $wgProfiling = true;
- $wgProfileToDatabase = true;
- $wgProfileSampleRate = 1;
}
// CORS (cross-domain AJAX, bug 20814)
@@ -564,7 +541,6 @@
include( $IP . '/extensions/CharInsert/CharInsert.php' );
include( $IP . '/extensions/ParserFunctions/ParserFunctions.php' );
-$wgMaxIfExistCount = 500; // obs
$wgExpensiveParserFunctionLimit = 500;
if ( $wmgUseCite ) {
@@ -617,7 +593,6 @@
if ( $wmgUseCategoryTree ) {
require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
- $wgCategoryTreeDynamicTag = true;
$wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
$wgCategoryTreeCategoryPageOptions =
$wmgCategoryTreeCategoryPageOptions;
}
@@ -863,13 +838,10 @@
} else {
$wgSiteNotice = "[//en.wikipedia.org/ See current Wikipedia]";
}
- $wgDefaultUserOptions['highlightbroken'] = 0;
// Nostalgia skin
require_once "$IP/skins/Nostalgia/Nostalgia.php";
}
-
-$wgUseHashTable = true;
$wgCopyrightIcon = '<a href="//wikimediafoundation.org/"><img src="//' .
$wmfHostnames['bits'] . '/images/wikimedia-button.png" width="88" height="31"
alt="Wikimedia Foundation"/></a>';
@@ -915,8 +887,7 @@
wfProfileIn( "$fname-misc3" );
// Various DB contention settings
-$wgAntiLockFlags = ALF_NO_LINK_LOCK | ALF_NO_BLOCK_LOCK;
-# $wgAntiLockFlags = ALF_PRELOAD_LINKS | ALF_PRELOAD_EXISTENCE;
+$wgAntiLockFlags = ALF_NO_LINK_LOCK;
if ( in_array( $wgDBname, array( 'testwiki', 'test2wiki', 'mediawikiwiki',
'commonswiki' ) ) ) {
$wgSiteStatsAsyncFactor = 1;
}
@@ -1204,8 +1175,6 @@
$wgCentralAuthCookies = true;
$wgDisableUnmergedEditing = $wmgDisableUnmergedEdits;
- $wgCentralAuthSilentLogin = $wmgCentralAuthSilentLogin;
- $wgCentralAuthUseOldAutoLogin = !$wgCentralAuthSilentLogin;
$wgCentralAuthUseEventLogging = $wmgCentralAuthUseEventLogging;
if( $wmfRealm == 'production' ) {
@@ -1470,7 +1439,6 @@
// Enable the CentralNotice/Translate integration
$wgNoticeUseTranslateExtension = true;
- $wgNoticeRunMessageIndexRebuildJobImmediately = false;
// Bug 49905
$wgNoticeUseLanguageConversion = true;
@@ -1754,7 +1722,6 @@
$wgUploadStashScalerBaseUrl =
"//{$wmfHostnames['upload']}/$site/$lang/thumb/temp";
$wgUploadWizardConfig = array(
# 'debug' => true,
- 'disableResourceLoader' => false,
'autoAdd' => array(
'categories' => array(
'Uploaded with UploadWizard',
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 740d840..f9f7f22 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10008,10 +10008,6 @@
'default' => 'loginwiki',
),
-'wmgCentralAuthSilentLogin' => array(
- 'default' => true,
-),
-
'wmgCentralAuthUseEventLogging' => array(
'default' => true,
),
--
To view, visit https://gerrit.wikimedia.org/r/154442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03528ff360998aa16d85d9247a85513dff060acd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <pleasest...@live.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
