From: nicolasconnault <nicolasconnault>
Date: Mon, 6 Aug 2007 06:07:23 +0000 (+0000)
Subject: MDL-9628 Removed superfluous & in URL (part of $report->baseurl) and reversed the... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ca145cc84eef0ad0a14106031cc197998d79c196;p=moodle.git

MDL-9628 Removed superfluous & in URL (part of $report->baseurl) and reversed the default sortitem order from ASC to DESC (highest grade first).
---

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 20ec0b7488..a620934d1b 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -87,9 +87,9 @@ class grade_report_grader extends grade_report {
 
         // base url for sorting by first/last name
         $this->baseurl = 'index.php?id='.$this->courseid.'&amp;perpage='.$this->get_pref('studentsperpage')
-                        .'&amp;page='.$this->page.'&amp;';
+                        .'&amp;page='.$this->page;
         //
-        $this->pbarurl = 'index.php?id='.$this->courseid.'&amp;perpage='.$this->get_pref('studentsperpage').'&amp;';
+        $this->pbarurl = 'index.php?id='.$this->courseid.'&amp;perpage='.$this->get_pref('studentsperpage');
 
         // Setup groups if requested
         if ($this->get_pref('showgroups')) {
@@ -188,11 +188,11 @@ class grade_report_grader extends grade_report {
 
         if ($this->sortitemid) {
             if (!isset($SESSION->gradeuserreport->sort)) {
-                $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
+                $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC';
             } else {
                 // this is the first sort, i.e. by last name
                 if (!isset($SESSION->gradeuserreport->sortitemid)) {
-                    $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
+                    $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC';
                 } else if ($SESSION->gradeuserreport->sortitemid == $this->sortitemid) {
                     // same as last sort
                     if ($SESSION->gradeuserreport->sort == 'ASC') {
diff --git a/grade/report/lib.php b/grade/report/lib.php
index bcfcdf81a6..e5ea752411 100755
--- a/grade/report/lib.php
+++ b/grade/report/lib.php
@@ -334,8 +334,8 @@ class grade_report {
         $this->group_selector = ob_get_clean();
 
         // update paging after group
-        $this->baseurl .= 'group='.$this->currentgroup.'&amp;';
-        $this->pbarurl .= 'group='.$this->currentgroup.'&amp;';
+        $this->baseurl .= 'group='.$this->currentgroup;
+        $this->pbarurl .= 'group='.$this->currentgroup;
 
         if ($this->currentgroup) {
             $this->groupsql = " LEFT JOIN {$CFG->prefix}groups_members gm ON gm.userid = u.id ";