Merge branch 'wip-MDL-48978-master' of git://github.com/marinaglancy/moodle

2015-01-28 11:58:50 +01:00
parent 17031f764f 17d33eec66
commit 8f2e522735
1 changed files with 1 additions and 1 deletions
@@ -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);
    }