From cc9384f12172b787b50f7503d035a8109c1d6ae3 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Fri, 3 Aug 2018 15:03:53 +0800 Subject: [PATCH] MDL-62279 assign: Properly set the defaults Before an assignment has been created, we need to use the site defaults, not the per instance defaults for the settings. --- mod/assign/submission/file/locallib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/assign/submission/file/locallib.php b/mod/assign/submission/file/locallib.php index 3b1959bf7f3..d7070f89967 100644 --- a/mod/assign/submission/file/locallib.php +++ b/mod/assign/submission/file/locallib.php @@ -69,11 +69,13 @@ class assign_submission_file extends assign_submission_plugin { public function get_settings(MoodleQuickForm $mform) { global $CFG, $COURSE; - $defaultmaxfilesubmissions = $this->get_config('maxfilesubmissions'); - $defaultmaxsubmissionsizebytes = $this->get_config('maxsubmissionsizebytes'); if ($this->assignment->has_instance()) { + $defaultmaxfilesubmissions = $this->get_config('maxfilesubmissions'); + $defaultmaxsubmissionsizebytes = $this->get_config('maxsubmissionsizebytes'); $defaultfiletypes = $this->get_config('filetypeslist'); } else { + $defaultmaxfilesubmissions = get_config('assignsubmission_file', 'maxfiles'); + $defaultmaxsubmissionsizebytes = get_config('assignsubmission_file', 'maxbytes'); $defaultfiletypes = get_config('assignsubmission_file', 'filetypes'); } $defaultfiletypes = (string)$defaultfiletypes;