MDL-17695 Added accessible text to dimmed activities. (Also bugfix for MDL-15499)

diff --git a/course/lib.php b/course/lib.php
index c17675c558ef2cd5aeded3131e032910f3476bb9..42b8090d0679784478e6ab99a68b5ac135c6beb1 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1439,10 +1439,10 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
             if ($mod->modname == "label") {
                 if (!$mod->visible || !$mod->uservisible) {
                     echo '<div class="dimmed_text"><span class="accesshide">'.
-                        get_string('hiddenfromstudents').'</span></div>';
+                        get_string('hiddenfromstudents').'</span>';
                 }
                 echo format_text($extra, FORMAT_HTML, $labelformatoptions);
-                if (!$mod->visible) {
+                if (!$mod->visible || !$mod->uservisible) {
                     echo "</div>";
                 }
                 if (!empty($CFG->enablegroupings) && !empty($mod->groupingid) && has_capability('moodle/course:managegroups', get_context_instance(CONTEXT_COURSE, $course->id))) {