From 3db52fd27fcb7ea74ba9e12c47814fc3fe6fd31f Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Wed, 28 Jan 2015 16:47:50 +0800
Subject: [PATCH] MDL-48978 user: fixed regression from MDL-37704

---
 user/edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user/edit.php b/user/edit.php
index c7f182bbf45..7d4ae94c5f5 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -209,7 +209,7 @@ if ($usernew = $userform->get_data()) {
     $usernew->timemodified = time();
 
     // Description editor element may not exist!
-    if (isset($usernew->description_editor)) {
+    if (isset($usernew->description_editor) && isset($usernew->description_format)) {
         $usernew = file_postupdate_standard_editor($usernew, 'description', $editoroptions, $personalcontext, 'user', 'profile', 0);
     }
 
-- 
2.11.4.GIT