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

…ODLE_21_STABLE
eSrem · Jul 2, 2012 · a0ca809 · a0ca809
2 parents e059f69 + 795fd70
commit a0ca809
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/form/filemanager.js b/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;

diff --git a/lib/form/filemanager.php b/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