X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FUser.php;h=ca3f79b5dec9c839a814ef2dbfe9bc00e5ea4256;hb=aea3a5dce215b9f3929d65365fe9bd101ecdf07d;hp=a2e702379a2ab4167cb70e7b8ce09529b7ce1248;hpb=a1e58c1c7b0e777ea0110642bdbabfa1411014b6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/User.php b/includes/User.php
index a2e702379a..ca3f79b5de 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -465,7 +465,7 @@ class User {
 	 * user_name and user_real_name are not provided because the whole row
 	 * will be loaded once more from the database when accessing them.
 	 *
-	 * @param array $row A row from the user table
+	 * @param stdClass $row A row from the user table
 	 * @param array $data Further data to load into the object (see User::loadFromRow for valid keys)
 	 * @return User
 	 */
@@ -1041,7 +1041,7 @@ class User {
 	/**
 	 * Initialize this object from a row from the user table.
 	 *
-	 * @param array $row Row from the user table to load.
+	 * @param stdClass $row Row from the user table to load.
 	 * @param array $data Further user data to load into the object
 	 *
 	 *	user_groups		Array with groups out of the user_groups table
@@ -3777,8 +3777,9 @@ class User {
 	 */
 	public function sendMail( $subject, $body, $from = null, $replyto = null ) {
 		if ( is_null( $from ) ) {
-			global $wgPasswordSender, $wgPasswordSenderName;
-			$sender = new MailAddress( $wgPasswordSender, $wgPasswordSenderName );
+			global $wgPasswordSender;
+			$sender = new MailAddress( $wgPasswordSender,
+				wfMessage( 'emailsender' )->inContentLanguage()->text() );
 		} else {
 			$sender = new MailAddress( $from );
 		}