Merge branch 'MDL-49146_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE

2016-02-15 12:13:34 +00:00
parent 9bb6b38dea 12b9fad2ed
commit d037aee9d3
1 changed files with 8 additions and 0 deletions
@@ -230,8 +230,16 @@ class format_singleactivity extends format_base {
        }

        // Make sure the current activity is in the 0-section.
+        $changed = false;
        if ($activity && $activity->sectionnum != 0) {
            moveto_module($activity, $modinfo->get_section_info(0));
+            $changed = true;
+        }
+        if ($activity && !$activity->visible) {
+            set_coursemodule_visible($activity->id, 1);
+            $changed = true;
+        }
+        if ($changed) {
            // Cache was reset so get modinfo again.
            $modinfo = get_fast_modinfo($this->courseid);
        }