Permalink
Browse files

Merge branch 'wip-MDL-34669-MOODLE_23_STABLE' of git://github.com/mar…

…inaglancy/moodle into MOODLE_23_STABLE
  • Loading branch information...
2 parents ebc5b65 + 5f2f276 commit 6f74e5b2f6e83c894bbb792ed543858db7549e07 @danpoltawski danpoltawski committed Aug 7, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 lib/form/editor.php
View
@@ -80,7 +80,12 @@ function MoodleQuickForm_editor($elementName=null, $elementLabel=null, $attribut
$this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']);
}
if (!$this->_options['context']) {
- $this->_options['context'] = get_context_instance(CONTEXT_SYSTEM);
+ // 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);

0 comments on commit 6f74e5b

Please sign in to comment.