From: TTO <at.light@live.com.au>
Date: Wed, 26 Feb 2014 06:06:17 +0000 (+0000)
Subject: Revert "DefaultSettings.php: Remove $wgPasswordSenderName"
X-Git-Tag: 1.31.0-rc.0~16815^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=1270fd4d89b80f92448b34a46d20947822786937;p=lhc%2Fweb%2Fwiklou.git

Revert "DefaultSettings.php: Remove $wgPasswordSenderName"

It seems that this variable is used by a whole
lot of extensions, so to remove it now would be
to break these other extensions.

This reverts commit acda2cc90aea519f41c8ae55bc4d05f02072df84.

Change-Id: I2bd3078508c0608ff58bae4c9ec456e57c617da8
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b0ed35b2f9..3526c96a78 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1329,6 +1329,13 @@ $wgPasswordSender = 'apache@' . $serverName;
 
 unset( $serverName ); # Don't leak local variables to global scope
 
+/**
+ * Password reminder name
+ *
+ * @deprecated since 1.23; use the system message 'emailsender' instead.
+ */
+$wgPasswordSenderName = 'MediaWiki Mail';
+
 /**
  * Dummy address which should be accepted during mail send action.
  * It might be necessary to adapt the address or to set it equal