Merged slashes fix for clean_text from STABLE

diff --git a/user/edit.php b/user/edit.php
index d58f4ed8ab145c714f8c3ddfff7d310863ad2c8e..96e6c76c417b671e3f8e0275949faa632c9004c4 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -52,7 +52,7 @@
         }
 
         foreach ($usernew as $key => $data) {
-            $usernew->$key = clean_text($usernew->$key, FORMAT_MOODLE);
+            $usernew->$key = addslashes(clean_text(stripslashes($usernew->$key), FORMAT_MOODLE));
         }
 
         $usernew->firstname = trim(strip_tags($usernew->firstname));