MDL-19794 Updated topic and course format's use of popup_form for temporarily working...

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index c2f923612588961ab02432dfa4ee6731ef2dcbd6..fba653159f285d149c6b4d759211c5941ebdf1b2 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -155,7 +155,7 @@
                } else {
                    $strsummary = ' - '.substr($strsummary, 0, 60).'...';
                }
-                $sectionmenu['topic='.$section] = s($section.$strsummary);
+                $sectionmenu[$section] = s($section.$strsummary);
             }
             $section++;
             continue;
@@ -252,7 +252,7 @@
 
     if (!empty($sectionmenu)) {
         echo '<div class="jumpmenu">';
-        echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&amp;', $sectionmenu,
+        echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&amp;topic=', $sectionmenu,
                    'sectionmenu', '', get_string('jumpto'), '', '', true);
         echo '</div>';
     }

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 8601ccf46b1d4c010d1c63174230a2f681a2fa10..d4cedf7124247a58be6815ed1bc42400d0d53edd 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -150,7 +150,7 @@
 
         if (!empty($displaysection) and $displaysection != $section) {  // Check this week is visible
             if ($showsection) {
-                $sectionmenu['week='.$section] = s("$strweek $section |     $weekday - $endweekday");
+                $sectionmenu[$section] = s("$strweek $section |     $weekday - $endweekday");
             }
             $section++;
             $weekdate = $nextweekdate;
@@ -244,7 +244,7 @@
 
     if (!empty($sectionmenu)) {
         echo '<div class="jumpmenu">';
-        echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&amp;', $sectionmenu,
+        echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&amp;week=', $sectionmenu,
                    'sectionmenu', '', get_string('jumpto'), '', '', true);
         echo '</div>';
     }