From 532a91d431bb522339901b18f5d75699d688414d Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Wed, 22 Sep 2010 08:18:18 +0000 Subject: [PATCH] MDL-24329 reverting previous patch, it should be imo better to not should discouraged legacycoursefiles option when it is disabled site-wide --- admin/settings/courses.php | 6 ++++-- course/edit_form.php | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/admin/settings/courses.php b/admin/settings/courses.php index 59a6aa52218..0e2a670f862 100644 --- a/admin/settings/courses.php +++ b/admin/settings/courses.php @@ -42,8 +42,10 @@ if ($hassiteconfig $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 index c46c8d4fe83..3de0d339841 100644 --- a/course/edit_form.php +++ b/course/edit_form.php @@ -163,6 +163,10 @@ class course_edit_form extends moodleform { } $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); } -- 2.17.1