diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /includes/mail/MailAddress.php | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/mail/MailAddress.php')
-rw-r--r-- | includes/mail/MailAddress.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/mail/MailAddress.php b/includes/mail/MailAddress.php index 68179088..7a228bda 100644 --- a/includes/mail/MailAddress.php +++ b/includes/mail/MailAddress.php @@ -38,7 +38,7 @@ class MailAddress { function __construct( $address, $name = null, $realName = null ) { if ( is_object( $address ) && $address instanceof User ) { // Old calling format, now deprecated - wfDeprecated( __METHOD__ . ' with a User object' , '1.24' ); + wfDeprecated( __METHOD__ . ' with a User object', '1.24' ); $this->address = $address->getEmail(); $this->name = $address->getName(); $this->realName = $address->getRealName(); |