From 2c01ba7bb77288aedc0174d2393f6f60737d1204 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.org>
Date: Thu, 28 Jul 2011 11:27:07 +0800
Subject: [PATCH] MDL-27896 editor - parent context will be respected by editor
 in case context is not created.

---
 course/edit.php         | 2 ++
 course/editcategory.php | 2 +-
 user/editadvanced.php   | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/course/edit.php b/course/edit.php
index d184328dff5..053d8bb8f03 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -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);
 }
 
diff --git a/course/editcategory.php b/course/editcategory.php
index f033b8d8102..52b9a63d8de 100644
--- a/course/editcategory.php
+++ b/course/editcategory.php
@@ -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;
 }
diff --git a/user/editadvanced.php b/user/editadvanced.php
index e85c97201c3..80c6930e435 100644
--- a/user/editadvanced.php
+++ b/user/editadvanced.php
@@ -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