From 04019ee089dd8112d1f1ddbcccbcf1dc0d34f4e9 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sat, 26 Sep 2009 19:13:12 +0000
Subject: [PATCH] MDL-20295 fixed problems with special email addresses

---
 user/edit.php    | 2 +-
 user/editlib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user/edit.php b/user/edit.php
index 08f9ea97a45..0dd5a8481cd 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -119,7 +119,7 @@
             if (isset($usernew->email) and $user->email != stripslashes($usernew->email) && !has_capability('moodle/user:update', $systemcontext)) {
                 $a = new stdClass();
                 $a->newemail = s(stripslashes($usernew->email));
-                $usernew->preference_newemail = stripslashes($usernew->email);
+                $usernew->preference_newemail = $usernew->email;
                 $usernew->preference_newemailkey = random_string(20);
                 $usernew->preference_newemailattemptsleft = 3;
                 $a->oldemail = s($user->email);
diff --git a/user/editlib.php b/user/editlib.php
index c89dd9686ba..f74b312b9ca 100644
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -28,7 +28,7 @@ function useredit_update_user_preference($usernew) {
     foreach($ua as $key=>$value) {
         if (strpos($key, 'preference_') === 0) {
             $name = substr($key, strlen('preference_'));
-            set_user_preference($name, $value, $usernew->id);
+            set_user_preference($name, stripslashes_recursive($value), $usernew->id);
         }
     }
 }