Merge "DefaultSettings.php: Remove $wgPasswordSenderName"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 3526c96..b0ed35b 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1329,13 +1329,6 @@ $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