MDL-36103 tablelib: links to user profiles are wrong in courses.

diff --git a/lib/tablelib.php b/lib/tablelib.php
index 6de22af..2a08616 100644 (file)
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -727,16 +727,19 @@ class flexible_table {
     function col_fullname($row) {
         global $COURSE, $CFG;
 
     function col_fullname($row) {
         global $COURSE, $CFG;
 

-        if (!$this->download) {
-            $profileurl = new moodle_url('/user/profile.php', array('id' => $row->{$this->useridfield}));
-            if ($COURSE->id != SITEID) {
-                $profileurl->param('course', $COURSE->id);
-            }
-            return html_writer::link($profileurl, fullname($row));
+        $name = fullname($row);
+        if ($this->download) {
+            return $name;
+        }

 
 

+        $userid = $row->{$this->useridfield};
+        if ($COURSE->id == SITEID) {
+            $profileurl = new moodle_url('/user/profile.php', array('id' => $userid));

         } else {
         } else {

-            return fullname($row);
+            $profileurl = new moodle_url('/user/view.php',
+                    array('id' => $userid, 'course' => $COURSE->id));

         }
         }

+        return html_writer::link($profileurl, $name);

     }
 
     /**
     }
 
     /**