From: nicolasconnault <nicolasconnault>
Date: Thu, 30 Jul 2009 03:48:08 +0000 (+0000)
Subject: MDL-19794 Updated topic and course format's use of popup_form for temporarily working... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=69e80c050259a350b0a51041b107cbb5c9265289;p=moodle.git

MDL-19794 Updated topic and course format's use of popup_form for temporarily working with new outputlib code. Will eventually need proper upgrading.
---

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index c2f9236125..fba653159f 100644
--- 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 8601ccf46b..d4cedf7124 100644
--- 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>';
     }