MDL-34669: Fix editor filepicker context bt trying to use page context

diff --git a/lib/form/editor.php b/lib/form/editor.php
index 32663e8..d922b09 100644 (file)
--- a/lib/form/editor.php
+++ b/lib/form/editor.php
@@ -80,7 +80,12 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
             $this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']);
         }
         if (!$this->_options['context']) {
-            $this->_options['context'] = context_system::instance();
+            // trying to set context to the current page context to make legacy files show in filepicker (e.g. forum post)
+            if (!empty($PAGE->context->id)) {
+                $this->_options['context'] = $PAGE->context;
+            } else {
+                $this->_options['context'] = context_system::instance();
+            }
         }
         $this->_options['trusted'] = trusttext_trusted($this->_options['context']);
         parent::HTML_QuickForm_element($elementName, $elementLabel, $attributes);