dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "RevisionStore::newRevisionFromBatch should use Title::newFromRow"
[lhc/web/wiklou.git]
/
includes
/
Setup.php
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
518531a
..
d450bdd
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-440,6
+440,13
@@
if ( $wgEnableEmail ) {
$wgUsersNotifiedOnAllChanges = [];
}
$wgUsersNotifiedOnAllChanges = [];
}
+// $wgSysopEmailBans deprecated in 1.34
+if ( isset( $wgSysopEmailBans ) && $wgSysopEmailBans === false ) {
+ foreach ( $wgGroupPermissions as $group => $_ ) {
+ unset( $wgGroupPermissions[$group]['blockemail'] );
+ }
+}
+
if ( $wgMetaNamespace === false ) {
$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
}
if ( $wgMetaNamespace === false ) {
$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
}
@@
-721,7
+728,7
@@
if ( is_null( $wgLocaltimezone ) ) {
date_default_timezone_set( $wgLocaltimezone );
if ( is_null( $wgLocalTZoffset ) ) {
date_default_timezone_set( $wgLocaltimezone );
if ( is_null( $wgLocalTZoffset ) ) {
- $wgLocalTZoffset = date( 'Z' ) / 60;
+ $wgLocalTZoffset =
(int)
date( 'Z' ) / 60;
}
// The part after the System| is ignored, but rest of MW fills it
// out as the local offset.
}
// The part after the System| is ignored, but rest of MW fills it
// out as the local offset.