From: skodak <skodak>
Date: Wed, 21 Mar 2007 22:00:10 +0000 (+0000)
Subject: MDL-7647 Broken links on confirmation email (or others) - patch by Paulo Matos; merge... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=13ce9e4f019efaf8a353c2c3d875e3210dd76a8a;p=moodle.git

MDL-7647 Broken links on confirmation email (or others) - patch by Paulo Matos; merged from MOODLE_17_STABLE
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 39a59c06bb..0154222118 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3549,7 +3549,7 @@ function reset_password_and_mail($user) {
 
     $subject = get_string('emailconfirmationsubject', '', format_string($site->fullname));
 
-    $data->link = $CFG->wwwroot .'/login/confirm.php?data='. $user->secret .'/'. $user->username;
+    $data->link = $CFG->wwwroot .'/login/confirm.php?data='. $user->secret .'/'. urlencode($user->username);
     $message     = get_string('emailconfirmation', '', $data);
     $messagehtml = text_to_html(get_string('emailconfirmation', '', $data), false, false, true);
 
@@ -3577,7 +3577,7 @@ function send_password_change_confirmation_email($user) {
     $data = new object();
     $data->firstname = $user->firstname;
     $data->sitename = format_string($site->fullname);
-    $data->link = $CFG->httpswwwroot .'/login/forgot_password.php?p='. $user->secret .'&s='. $user->username;
+    $data->link = $CFG->httpswwwroot .'/login/forgot_password.php?p='. $user->secret .'&s='. urlencode($user->username);
     $data->admin = fullname($from).' ('. $from->email .')';
 
     $message = get_string('emailpasswordconfirmation', '', $data);