From b1f65701ed4fda1e418912c0c5d74feef98ded1c Mon Sep 17 00:00:00 2001
From: thepurpleblob <thepurpleblob>
Date: Tue, 13 Sep 2005 13:50:52 +0000
Subject: [PATCH] merged from STABLE.

---
 user/edit.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/user/edit.php b/user/edit.php
index c4a655dd167..9beb46ac342 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -96,7 +96,12 @@
         $usernew->mailformat    = clean_param($usernew->mailformat,    PARAM_INT);
         $usernew->maildigest    = clean_param($usernew->maildigest,    PARAM_INT);
         $usernew->autosubscribe = clean_param($usernew->autosubscribe, PARAM_INT);
-        $usernew->htmleditor    = clean_param($usernew->htmleditor,    PARAM_INT);
+        if (!empty($CFG->htmleditor)) {
+            $usernew->htmleditor    = clean_param($usernew->htmleditor,    PARAM_INT);
+        }
+        else {
+            unset( $usernew->htmleditor );
+        }
         $usernew->emailstop     = clean_param($usernew->emailstop,     PARAM_INT);
 
         if (isset($usernew->timezone)) {