MDL-27896 editor - parent context will be respected by editor in case context is not created.
This commit is contained in:
@@ -82,6 +82,8 @@ if (!empty($course)) {
|
||||
$course = file_prepare_standard_editor($course, 'summary', $editoroptions, $coursecontext, 'course', 'summary', 0);
|
||||
|
||||
} else {
|
||||
//editor should respect category context if course context is not set.
|
||||
$editoroptions['context'] = $catcontext;
|
||||
$course = file_prepare_standard_editor($course, 'summary', $editoroptions, null, 'course', 'summary', null);
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ if ($id) {
|
||||
$category->parent = $parent;
|
||||
require_capability('moodle/category:manage', $context);
|
||||
$strtitle = get_string("addnewcategory");
|
||||
$editorcontext = null;
|
||||
$editorcontext = $context;
|
||||
$title = "$SITE->shortname: ".get_string('addnewcategory');
|
||||
$fullname = $SITE->fullname;
|
||||
}
|
||||
|
||||
@@ -125,7 +125,13 @@ if ($user->id !== -1) {
|
||||
} else {
|
||||
$usercontext = null;
|
||||
// This is a new user, we don't want to add files here
|
||||
$editoroptions = array('maxfiles'=>0, 'maxbytes'=>0, 'trusttext'=>false, 'forcehttps'=>false);
|
||||
$editoroptions = array(
|
||||
'maxfiles'=>0,
|
||||
'maxbytes'=>0,
|
||||
'trusttext'=>false,
|
||||
'forcehttps'=>false,
|
||||
'context' => $coursecontext
|
||||
);
|
||||
}
|
||||
|
||||
//create form
|
||||
|
||||
Reference in New Issue
Block a user