Merge branch 'MDL-58919-master-fix1' of https://github.com/snake/moodle

This commit is contained in:
Dan Poltawski 2017-06-21 10:22:11 +01:00
commit 8c0b1ec32b

View File

@ -71,10 +71,11 @@ class assign_submission_file extends assign_submission_plugin {
$defaultmaxfilesubmissions = $this->get_config('maxfilesubmissions');
$defaultmaxsubmissionsizebytes = $this->get_config('maxsubmissionsizebytes');
$defaultfiletypes = (string)$this->get_config('filetypeslist');
if ($defaultfiletypes == '') {
$defaultfiletypes = (string)get_config('assignsubmission_file', 'filetypes');
$defaultfiletypes = $this->get_config('filetypeslist');
if ($defaultfiletypes === false) {
$defaultfiletypes = get_config('assignsubmission_file', 'filetypes');
}
$defaultfiletypes = (string)$defaultfiletypes;
$settings = array();
$options = array();