Invisible sections are no longer shown in jump menu, see bug 2085

moodle · Feb 13, 2005 · 8dc93b9 · 8dc93b9
1 parent 8a6e783
commit 8dc93b9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/course/format/topics/format.php b/course/format/topics/format.php
@@ -129,22 +129,6 @@
 
     while ($section <= $course->numsections) {
 
-        if (!empty($displaysection) and $displaysection != $section) {
-            if (empty($sections[$section])) {
-                $strsummary = '';
-            } else {
-                $strsummary = ' - '.strip_tags($sections[$section]->summary);
-                if (strlen($strsummary) < 57) {
-                    $strsummary = ' - '.$strsummary;
-                } else {
-                    $strsummary = ' - '.substr($strsummary, 0, 60).'...';
-                }
-            }
-            $sectionmenu['topic='.$section] = s($section.$strsummary);
-            $section++;
-            continue;
-        }
-
         if (!empty($sections[$section])) {
             $thissection = $sections[$section];
 
@@ -161,6 +145,20 @@
 
         $showsection = (isteacher($course->id) or $thissection->visible or !$course->hiddensections);
 
+        if (!empty($displaysection) and $displaysection != $section) {
+            if ($showsection) {
+                $strsummary = ' - '.strip_tags($thissection->summary);
+                if (strlen($strsummary) < 57) {
+                    $strsummary = ' - '.$strsummary;
+                } else {
+                    $strsummary = ' - '.substr($strsummary, 0, 60).'...';
+                }
+                $sectionmenu['topic='.$section] = s($section.$strsummary);
+            }
+            $section++;
+            continue;
+        }
+
         if ($showsection) {
 
             $currenttopic = ($course->marker == $section);

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
@@ -131,13 +131,6 @@
         $weekday = userdate($weekdate, $strftimedateshort);
         $endweekday = userdate($weekdate+518400, $strftimedateshort);
 
-        if (!empty($displaysection) and $displaysection != $section) {  // Check this week is visible
-            $sectionmenu["week=$section"] = s("$strweek $section |     $weekday - $endweekday");
-            $section++;
-            $weekdate = $nextweekdate;
-            continue;
-        }
-
         if (!empty($sections[$section])) {
             $thissection = $sections[$section];
 
@@ -154,6 +147,15 @@
 
         $showsection = (isteacher($course->id) or $thissection->visible or !$course->hiddensections);
 
+        if (!empty($displaysection) and $displaysection != $section) {  // Check this week is visible
+            if ($showsection) {
+                $sectionmenu["week=$section"] = s("$strweek $section |     $weekday - $endweekday");
+            }
+            $section++;
+            $weekdate = $nextweekdate;
+            continue;
+        }
+
         if ($showsection) {
 
             $currentweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate));