Respect inherited default enrol method when deciding to display the course cost....

diff --git a/course/edit_form.php b/course/edit_form.php
index d13a59f70dda40be4767e891bd9654f961f5ab39..1c0431cd3dfde046fdbb2221ba667588d4e59e74 100644 (file)
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -316,7 +316,8 @@ class course_edit_form extends moodleform {
         if (!empty($course)) {
             $enrol_object = $course;
         }
-        if (method_exists(enrolment_factory::factory($enrol_object->enrol), 'print_entry') && $enrol_object->enrol != 'manual'){
+        // If the print_entry method exists and the course enrol method isn't manual (both set or inherited from site), show cost
+        if (method_exists(enrolment_factory::factory($enrol_object->enrol), 'print_entry') && !($enrol_object->enrol == 'manual' || (empty($enrol_object->enrol) && $CFG->enrol == 'manual'))) {
             $costgroup=array();
             $currencies = get_list_of_currencies();
             $costgroup[]= &MoodleQuickForm::createElement('text','cost', '', 'maxlength="6" size="6"');