Bug #5716 - Impossible to turn off highlighted current topic; merged from MOODLE_16_S...

diff --git a/course/format/lams/format.php b/course/format/lams/format.php
index 680d0fa5b42c98f175548f7ff88ea5e0f2062846..6e7a8523e494b187dc2af8b40eb409c8eb418c77 100644 (file)
--- a/course/format/lams/format.php
+++ b/course/format/lams/format.php
@@ -30,7 +30,7 @@ if ($topic != -1) {
     }
 }
 
-if (isteacher($course->id) and !empty($marker) and confirm_sesskey()) {
+if (($marker >=0) and isteacher($course->id) and confirm_sesskey()) {
     $course->marker = $marker;
     if (! set_field("course", "marker", $marker, "id", $course->id)) {
         error("Could not mark that topic for this course");

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 198bfd89975064f3282458cbee3fe32ea50f206b..80f2ae42454a0fc818c9774bf7ad4ea84fb56593 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -31,7 +31,7 @@
         }
     }
 
-    if ($marker && isteacher($course->id) && confirm_sesskey()) {
+    if (($marker >=0) && isteacher($course->id) && confirm_sesskey()) {
         $course->marker = $marker;
         if (! set_field("course", "marker", $marker, "id", $course->id)) {
             error("Could not mark that topic for this course");

diff --git a/course/view.php b/course/view.php
index d9afd08fd0b24815c4408fac867f93bf87692e50..db0458cdc90565a768960edc9877757fad8c3b03 100644 (file)
--- a/course/view.php
+++ b/course/view.php
@@ -15,7 +15,7 @@
     $studentview = optional_param('studentview', -1, PARAM_BOOL);
     $section     = optional_param('section', 0, PARAM_INT);
     $move        = optional_param('move', 0, PARAM_INT);
-    $marker      = optional_param('marker',0 , PARAM_INT);
+    $marker      = optional_param('marker',-1 , PARAM_INT);
 
 
     if (empty($id) && empty($name) && empty($idnumber)) {