mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski 2016-08-09 10:58:40 +01:00
commit f616fc1b50
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
user/editor.php
View File

@ -36,7 +36,7 @@ $PAGE->set_url('/user/editor.php', array('id' => $userid, 'course' => $courseid)
list($user, $course) = useredit_setup_preference_page($userid, $courseid);
// Create form.
$editorform = new user_edit_editor_form(null, array('userid' => $user->id));
$editorform = new user_edit_editor_form();
$user->preference_htmleditor = get_user_preferences( 'htmleditor', '', $user->id);
$editorform->set_data($user);

4
user/editor_form.php
View File

@ -45,6 +45,10 @@ class user_edit_editor_form extends moodleform {
$mform = $this->_form;
$editors = editors_get_enabled();
$mform->addElement('hidden', 'id');
$mform->setType('id', PARAM_INT);
if (count($editors) > 1) {
$choices = array('' => get_string('defaulteditor'));
$firsteditor = '';