From b84a84258cdbccd8549e117a7ff6c52d3c7a6eca Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Wed, 14 Nov 2012 16:53:27 +0000 Subject: [PATCH] MDL-36601 Ensure that reports remember all days setting All Days was set as the nothing value, but this nothing value was used. Additionally, an insufficient comparison meant that the selecteddate then became Today. --- report/log/locallib.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/report/log/locallib.php b/report/log/locallib.php index 5fda822e387..7647c8e1242 100644 --- a/report/log/locallib.php +++ b/report/log/locallib.php @@ -280,7 +280,10 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, $timemidnight = $today = usergetmidnight($timenow); // Put today up the top of the list - $dates = array("$timemidnight" => get_string("today").", ".userdate($timenow, $strftimedate) ); + $dates = array( + "0" => get_string('alldays'), + "$timemidnight" => get_string("today").", ".userdate($timenow, $strftimedate) + ); if (!$course->startdate or ($course->startdate > $timenow)) { $course->startdate = $course->timecreated; @@ -294,7 +297,7 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, $numdates++; } - if ($selecteddate == "today") { + if ($selecteddate === "today") { $selecteddate = $today; } @@ -354,7 +357,7 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, } echo html_writer::label(get_string('date'), 'menudate', false, array('class' => 'accesshide')); - echo html_writer::select($dates, "date", $selecteddate, get_string("alldays")); + echo html_writer::select($dates, "date", $selecteddate, false); echo html_writer::label(get_string('showreports'), 'menumodid', false, array('class' => 'accesshide')); echo html_writer::select($activities, "modid", $selectedactivity, get_string("allactivities")); echo html_writer::label(get_string('actions'), 'menumodaction', false, array('class' => 'accesshide'));