X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=blobdiff_plain;f=course%2Fedit_form.php;h=c37d99d0bd4e2ea20cfcaf52a9469cf9f491cb42;hp=f69f1b2031467802817a4af083eea95b9a67c006;hb=db1218a970f3c4f62f3fc59e8ec0e95d8fc1ab15;hpb=5ad337c86ca0cedaf574c6f03e06a4ef81b7cb50

diff --git a/course/edit_form.php b/course/edit_form.php
index f69f1b20314..c37d99d0bd4 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -200,9 +200,13 @@ class course_edit_form extends moodleform {
         $mform->addElement('select', 'visible', get_string('availability'), $choices);
         $mform->addHelpButton('visible', 'availability');
         $mform->setDefault('visible', $courseconfig->visible);
-        if (!empty($course->id) and !has_capability('moodle/course:visibility', $coursecontext)) {
+        if (!has_capability('moodle/course:visibility', $context)) {
             $mform->hardFreeze('visible');
-            $mform->setConstant('visible', $course->visible);
+            if (!empty($course->id)) {
+                $mform->setConstant('visible', $course->visible);
+            } else {
+                $mform->setConstant('visible', $category->visible);
+            }
         }
 
 //--------------------------------------------------------------------------------