From: Federico Leva <federicoleva@tiscali.it>
Date: Wed, 19 Sep 2012 14:33:19 +0000 (+0200)
Subject: (bug 11056) Closing bracket skipped in emailed links
X-Git-Tag: 1.31.0-rc.0~22334^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=ddf8538d4221ecfb333db429e791c8425336d8fd;p=lhc%2Fweb%2Fwiklou.git

(bug 11056) Closing bracket skipped in emailed links

Fixing password reminders, reported on TWN.
Adding <> as already done for enotif and translationnotif.
Directly in the parameter as requested by Siebrand on I5aac9a75.

Change-Id: Ib796d28b73ae61e472113dd062e487fbdb8bf1bb
---

diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index efb5765768..c09da4e6f2 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -247,7 +247,7 @@ class SpecialPasswordReset extends FormSpecialPage {
 			$username,
 			$passwordBlock,
 			count( $passwords ),
-			Title::newMainPage()->getCanonicalUrl(),
+			'<' . Title::newMainPage()->getCanonicalUrl() . '>',
 			round( $wgNewPasswordExpiry / 86400 )
 		);
 
diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index c101897219..3e7f37a2e3 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -833,7 +833,7 @@ class LoginForm extends SpecialPage {
 		$u->setNewpassword( $np, $throttle );
 		$u->saveSettings();
 		$userLanguage = $u->getOption( 'language' );
-		$m = $this->msg( $emailText, $ip, $u->getName(), $np, $wgServer . $wgScript,
+		$m = $this->msg( $emailText, $ip, $u->getName(), $np, '<' . $wgServer . $wgScript . '>',
 			round( $wgNewPasswordExpiry / 86400 ) )->inLanguage( $userLanguage )->text();
 		$result = $u->sendMail( $this->msg( $emailTitle )->inLanguage( $userLanguage )->text(), $m );