L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-58919-master' of https://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Jake Dallimore
2017-06-22 16:09:56 +02:00
committed by Eloy Lafuente (stronk7)
parent b78887cc4b 412a56027b
commit 828540b557
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/submission/file/locallib.php
+3 -2
View File
@@ -71,8 +71,9 @@ class assign_submission_file extends assign_submission_plugin {
$defaultmaxfilesubmissions = $this->get_config('maxfilesubmissions');
$defaultmaxsubmissionsizebytes = $this->get_config('maxsubmissionsizebytes');
$defaultfiletypes = $this->get_config('filetypeslist');
if ($defaultfiletypes === false) {
if ($this->assignment->has_instance()) {
$defaultfiletypes = $this->get_config('filetypeslist');
} else {
$defaultfiletypes = get_config('assignsubmission_file', 'filetypes');
}
$defaultfiletypes = (string)$defaultfiletypes;