MDL-10084 propogate course id through calendar pages to ensure consistent display...

diff --git a/calendar/event_delete.html b/calendar/event_delete.html
index 8ebe69fb51ed13d0d5cb5fe9f88604f3324dbdf8..0ba12324e26c6f15f305ee37bd5794d5050db1d0 100644 (file)
--- a/calendar/event_delete.html
+++ b/calendar/event_delete.html
@@ -12,6 +12,7 @@
       <input type="hidden" name="y" value="<?php echo $y; ?>" />
       <input type="hidden" name="confirm" value="1" />
       <input type="hidden" name="repeats" value="0" />
+      <input type="hidden" name="course" value="<?php p($urlcourse); ?>" />
       &nbsp;
       </p>
       </form>
@@ -29,6 +30,7 @@
       <input type="hidden" name="y" value="<?php echo $y; ?>" />
       <input type="hidden" name="confirm" value="1" />
       <input type="hidden" name="repeats" value="1" />
+      <input type="hidden" name="course" value="<?php p($urlcourse); ?>" />
       &nbsp;
       </p>
       </form>
@@ -43,6 +45,7 @@
       <input type="hidden" name="cal_m" value="<?php echo $m; ?>" />
       <input type="hidden" name="cal_d" value="<?php echo $d; ?>" />
       <input type="hidden" name="cal_y" value="<?php echo $y; ?>" />
+      <input type="hidden" name="course" value="<?php p($urlcourse); ?>" />
       &nbsp;
       </p>
       </form>

diff --git a/calendar/event_edit.html b/calendar/event_edit.html
index 8e612edc82d41ce104a26b4702585f48be285eba..617686044446e39d734154cc744b8771265f02f7 100644 (file)
--- a/calendar/event_edit.html
+++ b/calendar/event_edit.html
@@ -88,6 +88,7 @@
 <input type="hidden" name="courseid" value="<?php echo $form->courseid; ?>" />
 <input type="hidden" name="format" value="<?php echo $form->format; ?>" />
 <input type="hidden" name="action" value="edit" />
+<input type="hidden" name="course" value="<?php p($urlcourse); ?>" />
 </p>
 </form>
 

diff --git a/calendar/event_new.html b/calendar/event_new.html
index 47af5684651c449ed519cf08d4ea0f3c4dd3d65e..15035d5e04bef74da9b795a34a0e2386f699d1ba 100644 (file)
--- a/calendar/event_new.html
+++ b/calendar/event_new.html
@@ -98,6 +98,7 @@
 <input type="hidden" name="format" value="<?php echo $form->format; ?>" />
 <input type="hidden" name="action" value="new" />
 <input type="hidden" name="type" value="<?php echo $form->type; ?>" />
+<input type="hidden" name="course" value="<?php p($urlcourse); ?>" />
 </p>
 </form>
 

diff --git a/calendar/event_select.html b/calendar/event_select.html
index 1e827f713ffcd48bb5c09848bebb87cbdfb6017f..09049b1273310e83bf8044e97360e339b66f1b35 100644 (file)
--- a/calendar/event_select.html
+++ b/calendar/event_select.html
@@ -31,5 +31,6 @@
 <p>
 <input type="hidden" name="action" value="new" />
 <input type="hidden" name="timestart" value="<?php echo $form->timestart; ?>" />
+<input type="hidden" name="course" value="<?php p($urlcourse); ?>" />
 </p>
 </form>
\ No newline at end of file

diff --git a/calendar/set.php b/calendar/set.php
index 9beba6a2ccaf9404f9ab437cce1a1b7c8f9efcda..0893605a1f33688066aef15e70d8f0bbbf9a54ca 100644 (file)
--- a/calendar/set.php
+++ b/calendar/set.php
@@ -48,6 +48,8 @@
     $cal_d = optional_param('cal_d');
     $cal_m = optional_param('cal_m');
     $cal_y = optional_param('cal_y');
+    $action = optional_param('action');
+    $type = optional_param('type');
 
     // Initialize the session variables
     calendar_session_vars();