* Added --override switch for disabled pages in updateSpecialPages.php
* Provide a unique message (ipb_blocked_as_range) if unblock of a single IP fails
because it is part of a blocked range.
+* (bug 3973) Use a separate message for the email content when an account is
+ created by another user
=== Bug fixes in 1.12 ===
// Wipe the initial password and mail a temporary one
$u->setPassword( null );
$u->saveSettings();
- $result = $this->mailPasswordInternal( $u, false );
+ $result = $this->mailPasswordInternal( $u, false, 'createaccount-title', 'createaccount-text' );
wfRunHooks( 'AddNewAccount', array( $u ) );
return;
}
- $result = $this->mailPasswordInternal( $u, true );
+ $result = $this->mailPasswordInternal( $u, true, 'passwordremindertitle', 'passwordremindertext' );
if( WikiError::isError( $result ) ) {
$this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) );
} else {
/**
+ * @param object user
+ * @param bool throttle
+ * @param string message name of email title
+ * @param string message name of email text
* @return mixed true on success, WikiError on failure
* @private
*/
- function mailPasswordInternal( $u, $throttle = true ) {
+ function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle', $emailText = 'passwordremindertext' ) {
global $wgCookiePath, $wgCookieDomain, $wgCookiePrefix, $wgCookieSecure;
global $wgServer, $wgScript;
$ip = wfGetIP();
if ( '' == $ip ) { $ip = '(Unknown)'; }
- $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np, $wgServer . $wgScript );
+ $m = wfMsg( $emailText, $ip, $u->getName(), $np, $wgServer . $wgScript );
+ $result = $u->sendMail( wfMsg( $emailTitle ), $m );
- $result = $u->sendMail( wfMsg( 'passwordremindertitle' ), $m );
return $result;
}
'invalidemailaddress' => 'Die E-Mail-Adresse wurde nicht akzeptiert, da sie ein ungültiges Format aufzuweisen scheint. Bitte gib eine Adresse in einem gültigen Format ein oder leere das Feld.',
'accountcreated' => 'Benutzerkonto erstellt',
'accountcreatedtext' => 'Das Benutzerkonto $1 wurde eingerichtet.',
+'createaccount-title' => 'Erstellung eines Benutzerkontos für {{SITENAME}}',
+'createaccount-text' => 'Jemand ($1) hat ein Benutzerkonto "$2" auf {{SITENAME}}.
+($4) erstellt. Das Passwort for "$2" ist "$3". Du solltest dich nun anmelden und dein Passwort ändern.
+
+Du kannst diese Nachricht ignorieren, falls das Benutzerkonto durch einen Fehler angelegt wurde.',
'loginlanguagelabel' => 'Sprache: $1',
# Password reset dialog
format. Please enter a well-formatted address or empty that field.',
'accountcreated' => 'Account created',
'accountcreatedtext' => 'The user account for $1 has been created.',
+'createaccount-title' => 'Account creation for {{SITENAME}}',
+'createaccount-text' => 'Someone ($1) created an account for $2 on {{SITENAME}}
+($4). The password for "$2" is "$3". You should log in and change your password
+now.
+
+You may ignore this message, if this account was created in error.',
'loginlanguagelabel' => 'Language: $1',
'loginlanguagelinks' => '* Deutsch|de
* English|en