MDL-24329 reverting previous patch, it should be imo better to not sh…

…ould discouraged legacycoursefiles option when it is disabled site-wide
TheVirtualLtd · Sep 22, 2010 · 532a91d · 532a91d
1 parent 14f001a
commit 532a91d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/admin/settings/courses.php b/admin/settings/courses.php
@@ -42,8 +42,10 @@
     $temp->add(new admin_setting_configselect('moodlecourse/maxbytes', get_string('maximumupload'), get_string('coursehelpmaximumupload'), key($choices), $choices));
 
 
-    $choices = array('0'=>get_string('no'), '2'=>get_string('yes'));
-    $temp->add(new admin_setting_configselect('moodlecourse/legacyfiles', get_string('courselegacyfiles'), get_string('courselegacyfiles_help'), key($choices), $choices));
+    if (!empty($CFG->legacyfilesinnewcourses)) {
+        $choices = array('0'=>get_string('no'), '2'=>get_string('yes'));
+        $temp->add(new admin_setting_configselect('moodlecourse/legacyfiles', get_string('courselegacyfiles'), get_string('courselegacyfiles_help'), key($choices), $choices));
+    }
 
     $temp->add(new admin_setting_heading('groups', get_string('groups', 'group'), ''));
     $choices = array();

diff --git a/course/edit_form.php b/course/edit_form.php
@@ -163,6 +163,10 @@ function definition() {
             }
             $mform->addElement('select', 'legacyfiles', get_string('courselegacyfiles'), $choices);
             $mform->addHelpButton('legacyfiles', 'courselegacyfiles');
+            if (!isset($courseconfig->legacyfiles)) {
+                // in case this was not initialised properly due to switching of $CFG->legacyfilesinnewcourses
+                $courseconfig->legacyfiles = 0;
+            }
             $mform->setDefault('legacyfiles', $courseconfig->legacyfiles);
         }