Merge branch 'MDL-48445-master' of https://github.com/jmarshall-netsp…

…ot/moodle
NoelDeMartin · Dec 22, 2014 · 2da35cd · 2da35cd
2 parents b8572fa + 404e33e
commit 2da35cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/report/log/classes/renderable.php b/report/log/classes/renderable.php
@@ -134,6 +134,7 @@ public function __construct($logreader = "", $course = 0, $userid = 0, $modid =
             $url = new moodle_url($url);
         }
         $this->selectedlogreader = $logreader;
+        $url->param('logreader', $logreader);
 
         // Use site course id, if course is empty.
         if (!empty($course) && is_int($course)) {

diff --git a/report/log/classes/renderer.php b/report/log/classes/renderer.php
@@ -73,7 +73,9 @@ public function reader_selector(report_log_renderable $reportlog) {
         if (empty($readers)) {
             $readers = array(get_string('nologreaderenabled', 'report_log'));
         }
-        $select = new single_select($reportlog->url, 'logreader', $readers, $reportlog->selectedlogreader, null);
+        $url = fullclone ($reportlog->url);
+        $url->remove_params(array('logreader'));
+        $select = new single_select($url, 'logreader', $readers, $reportlog->selectedlogreader, null);
         $select->set_label(get_string('selectlogreader', 'report_log'));
         echo $this->output->render($select);
     }