Merge branch 'wip-MDL-46338-m26' of git://github.com/marinaglancy/moo…

…dle into MOODLE_26_STABLE
moodle · Jul 29, 2014 · 765ba4c · 765ba4c
2 parents 2d1ac61 + 198c28c
commit 765ba4c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/enrol/self/lib.php b/enrol/self/lib.php
@@ -48,8 +48,11 @@ public function get_info_icons(array $instances) {
         $key = false;
         $nokey = false;
         foreach ($instances as $instance) {
-            if (!$instance->customint6) {
+            if ($this->can_self_enrol($instance, false) !== true) {
-                // New enrols not allowed.
+                // User can not enrol himself.
+                // Note that we do not check here if user is already enrolled for performance reasons -
+                // such check would execute extra queries for each course in the list of courses and
+                // would hide self-enrolment icons from guests.
                 continue;
             }
             if ($instance->password or $instance->customint1) {