From 9e202d38c833cd6eed1e2bb1279223d1f7e2fb6b Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan.poltawski@luns.net.uk>
Date: Thu, 30 Dec 2010 12:00:36 +0000
Subject: [PATCH] statistics MDL-25822 Fix broken navigation

---
 course/report/stats/index.php | 13 ++++++++-----
 course/report/stats/lib.php   |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/course/report/stats/index.php b/course/report/stats/index.php
index adca0117e76ee..6af3bc74a62c0 100644
--- a/course/report/stats/index.php
+++ b/course/report/stats/index.php
@@ -37,9 +37,14 @@
 
     require_login($course);
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
-
     require_capability('coursereport/stats:view', $context);
 
+    $PAGE->set_url(new moodle_url('/course/report/stats/index.php', array('course' => $course->id,
+                                                                          'report' => $report,
+                                                                          'time'   => $time,
+                                                                          'mode'   => $mode,
+                                                                          'userid' => $userid)));
+
     add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id);
     stats_check_uptodate($course->id);
 
@@ -52,10 +57,8 @@
 
         $PAGE->set_title("$course->shortname: $strstats");
         $PAGE->set_heading($course->fullname);
-        //$PAGE->set_headingmenu();
-        $PAGE->navbar->add($strreports, new moodle_url('/course/report.php', array('id'=>$course->id)));
-        $PAGE->navbar->add($strstats);
-        $PAGE->headingmenu(report_stats_mode_menu($course, $mode, $time, "$CFG->wwwroot/course/report/stats/index.php"));
+        $PAGE->set_pagelayout('report');
+        $PAGE->set_headingmenu(report_stats_mode_menu($course, $mode, $time, "$CFG->wwwroot/course/report/stats/index.php"));
         echo $OUTPUT->header();
     }
 
diff --git a/course/report/stats/lib.php b/course/report/stats/lib.php
index 85a7609b07610..ed31e78cc9a86 100644
--- a/course/report/stats/lib.php
+++ b/course/report/stats/lib.php
@@ -46,7 +46,7 @@ function report_stats_mode_menu($course, $mode, $time, $url) {
     $popupurl = $url."?course=$course->id&time=$time";
     $select = new single_select(new moodle_url($popupurl), 'mode', $options, $mode, null);
     $select->formid = 'switchmode';
-    echo $OUTPUT->render($select);
+    return $OUTPUT->render($select);
 }
 
 
@@ -86,7 +86,7 @@ function stats_report_extend_navigation($navigation, $course, $context) {
     global $CFG, $OUTPUT;
     if (has_capability('coursereport/stats:view', $context)) {
         if (!empty($CFG->enablestats)) {
-            $url = new moodle_url('/course/report/stats/index.php', array('id'=>$course->id));
+            $url = new moodle_url('/course/report/stats/index.php', array('course'=>$course->id));
             $navigation->add(get_string('stats'), $url, navigation_node::TYPE_SETTING, null, null, new pix_icon('i/report', ''));
         }
     }