Index: grade/report/grader/lib.php
===================================================================
RCS file: /home/cvs_repositories/globalcvs/ou-moodle/grade/report/grader/lib.php,v
retrieving revision 1.18
diff -u -r1.18 lib.php
--- grade/report/grader/lib.php	8 Dec 2009 09:45:54 -0000	1.18
+++ grade/report/grader/lib.php	18 Dec 2009 16:50:44 -0000
@@ -731,17 +731,17 @@
                 }
 
                 $userreportcell = '';
-                if (has_capability('gradereport/user:view', $this->context)) {
+                if (has_capability('gradereport/'.$CFG->grade_profilereport.':view', $this->context)) {
                     $a->user = fullname($user);
                     $strgradesforuser = get_string('gradesforuser', 'grades', $a);
-                    $userreportcell = '<th class="userreport"><a href="'.$CFG->wwwroot.'/grade/report/user/index.php?id='.$this->courseid.'&amp;userid='.$user->id.'">'
+                    $userreportcell = '<th class="header userreport"><a href="'.$CFG->wwwroot.'/grade/report/'.$CFG->grade_profilereport.'/index.php?id='.$this->courseid.'&amp;userid='.$user->id.'">'
                                     .'<img src="'.$CFG->pixpath.'/t/grades.gif" alt="'.$strgradesforuser.'" title="'.$strgradesforuser.'" /></a></th>';
                 }
 
                 $studentshtml .= '<tr class="r'.$this->rowcount++ . $row_classes[$this->rowcount % 2] . '">'
                               .'<th class="c'.$columncount++.' user" scope="row" onclick="set_row(this.parentNode.rowIndex);">'.$user_pic
                               .'<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->course->id.'">'
-                              .fullname($user)."</a>$userreportcell</th>\n";
+                              .fullname($user)."</a></th>$userreportcell\n";
 
                 if ($showuseridnumber) {
                     $studentshtml .= '<th class="c'.$columncount++.' useridnumber" onclick="set_row(this.parentNode.rowIndex);">'.
@@ -1171,6 +1171,9 @@
                     $colspan = 'colspan="2" ';
                 }
                 $avghtml .= '<th class="header c0 range" '.$colspan.' scope="row">'.$straverage.'</th>';
+            }
+            if (has_capability('gradereport/'.$CFG->grade_profilereport.':view', $this->context)) {
+                $avghtml .= '<th class="header userreport"></th>';
             }
 
             foreach ($this->gtree->items as $itemid=>$unused) {