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

This commit is contained in:
Eloy Lafuente (stronk7) 2015-01-28 11:52:45 +01:00
commit 8f2e522735

View File

@ -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);
}