Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-30008-21' of git://github.com/FMCorz/moodle into MO…

…ODLE_21_STABLE
  • Loading branch information...
commit a0ca809653461b05b9d546c074a45510511d223b 2 parents e059f69 + 795fd70
@danpoltawski danpoltawski authored
Showing with 2 additions and 1 deletion.
  1. +1 −0  lib/form/filemanager.js
  2. +1 −1  lib/form/filemanager.php
View
1  lib/form/filemanager.js
@@ -69,6 +69,7 @@ M.form_filemanager.init = function(Y, options) {
this.filepicker_options.maxbytes = this.maxbytes;
this.filepicker_options.env = 'filemanager';
this.filepicker_options.itemid = options.itemid;
+ this.filepicker_options.accepted_types = options.accepted_types;
if (options.filecount) {
this.filecount = options.filecount;
View
2  lib/form/filemanager.php
@@ -124,7 +124,7 @@ function toHtml() {
$subdirs = $this->_options['subdirs'];
$maxbytes = $this->_options['maxbytes'];
$draftitemid = $this->getValue();
- $accepted_types = $this->_options['accepted_types'];
+ $accepted_types = (array) $this->_options['accepted_types'];
if (empty($draftitemid)) {
// no existing area info provided - let's use fresh new draft area
Please sign in to comment.
Something went wrong with that request. Please try again.