From bae9a29ec21d218f3c2809718e3f79bc2ea790c7 Mon Sep 17 00:00:00 2001
From: peterbulmer <peterbulmer>
Date: Mon, 12 Jan 2009 02:02:06 +0000
Subject: [PATCH] MDL-10498: Apostrophe / Quote in username or email breaks
 profile update

Author: Aaron Barnes <aaronb@catalyst.net.nz>
---
 user/edit_form.php         | 2 +-
 user/editadvanced_form.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user/edit_form.php b/user/edit_form.php
index d46650af898..eea10d51766 100644
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -109,7 +109,7 @@ class user_edit_form extends moodleform {
         // validate email
         if (!validate_email($usernew->email)) {
             $err['email'] = get_string('invalidemail');
-        } else if (($usernew->email !== $user->email) and record_exists('user', 'email', $usernew->email, 'mnethostid', $CFG->mnet_localhost_id)) {
+        } else if ((stripslashes($usernew->email) !== $user->email) and record_exists('user', 'email', $usernew->email, 'mnethostid', $CFG->mnet_localhost_id)) {
             $err['email'] = get_string('emailexists');
         }
 
diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index 1d04025f711..de89368163f 100644
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -135,7 +135,7 @@ class user_editadvanced_form extends moodleform {
             }
         }
 
-        if (!$user or $user->email !== $usernew->email) {
+        if (!$user or $user->email !== stripslashes($usernew->email)) {
             if (!validate_email($usernew->email)) {
                 $err['email'] = get_string('invalidemail');
             } else if (record_exists('user', 'email', $usernew->email, 'mnethostid', $CFG->mnet_localhost_id)) {