Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support empty string for wgEmergencyContact/wgPasswordSender

Browse source 
In previous versions, the installer often outputted the following
in the generated LocalSettings.php:
> $wgEmergencyContact = '';
> $wgPasswordSender = '';

While this case did not result in providing default values in recent
MediaWiki versions, the mail handling didn't cause an error.

As of MediaWiki 1.25, the error handling is more strict and these
values being empty causes a fatal error and breaks all outgoing mail.

Bug: T104142
Change-Id: Ibf1f857b2f250dac9b725aff8f442e08b8ecd5c9
This commit is contained in:
Timo Tijhof 2015-08-31 17:32:56 +02:00 committed by Krinkle
parent fe1cd2e05d
commit 583fdd54ad
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.26
View file

@ -83,6 +83,8 @@ production.
* (T53283) load.php sometimes sends 304 response without full headers
* (T65198) Talk page tabs now have a "rel=discussion" attribute
* (T98841) {{msgnw:}} now preserves comments even when subst: is not used.
* (T104142) $wgEmergencyContact and $wgPasswordSender now use their default
value if set to an empty string.
=== Action API changes in 1.26 ===
* New-style continuation is now the default for action=continue. Clients may

6
includes/Setup.php
View file

@ -522,11 +522,11 @@ unset( $serverParts );
// Set defaults for configuration variables
// that are derived from the server name by default
if ( $wgEmergencyContact === false ) {
// Note: $wgEmergencyContact and $wgPasswordSender may be false or empty string (T104142)
if ( !$wgEmergencyContact ) {
$wgEmergencyContact = 'wikiadmin@' . $wgServerName;
}
if ( $wgPasswordSender === false ) {
if ( !$wgPasswordSender ) {
$wgPasswordSender = 'apache@' . $wgServerName;
}