MDL-9628 Removed superfluous & in URL (part of $report->baseurl) and reversed the...

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 20ec0b7488f5d875efbaccbf16f8cdc3afba176f..a620934d1ba5e807b965730e312ecbb1533e24c0 100644 (file)
--- 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.'&perpage='.$this->get_pref('studentsperpage')
-                        .'&page='.$this->page.'&';
+                        .'&page='.$this->page;
         //
-        $this->pbarurl = 'index.php?id='.$this->courseid.'&perpage='.$this->get_pref('studentsperpage').'&';
+        $this->pbarurl = 'index.php?id='.$this->courseid.'&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 bcfcdf81a6a969f28ca0cdafcb388200766c4272..e5ea7524111e9f94871c47e14a70419d4b1df9f3 100755 (executable)
--- 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.'&';
-        $this->pbarurl .= 'group='.$this->currentgroup.'&';
+        $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 ";