Merge branch 'wip-MDL-34117-master' of git://github.com/marinaglancy/moodle

This commit is contained in:
Dan Poltawski 2012-07-02 17:09:44 +08:00
commit fc7f44a961

View file

@ -975,7 +975,7 @@ M.form_filemanager.init = function(Y, options) {
var manager = new FileManagerHelper(options); var manager = new FileManagerHelper(options);
var dndoptions = { var dndoptions = {
filemanager: manager, filemanager: manager,
acceptedtypes: options.accepted_types, acceptedtypes: options.filepicker.accepted_types,
clientid: options.client_id, clientid: options.client_id,
author: options.author, author: options.author,
maxfiles: options.maxfiles, maxfiles: options.maxfiles,