Messages block: Incorrect link to user profile

The block incorrectly links to site profile in the current pageid.
This doens't make sense in a number of different scenarios, but
most notably if the user who messaged isn't enrolled in the current
course. Instead link to the profile at site context like the messaging
popup does.

Fixes: MDL-18279 MDL-6890 MDL-5887
merged from MOODLE_19_STABLE

diff --git a/blocks/messages/block_messages.php b/blocks/messages/block_messages.php
index f86833cc101f503af9a5de3787e971aefcbc9c29..0c669bbb97c03c358d3d1ae9abb2342cedb9cdb1 100644 (file)
--- a/blocks/messages/block_messages.php
+++ b/blocks/messages/block_messages.php
@@ -40,8 +40,8 @@ class block_messages extends block_base {
             $this->content->text .= '<ul class="list">';
             foreach ($users as $user) {
                 $timeago = format_time(time() - $user->lastaccess);
-                $this->content->text .= '<li class="listentry"><div class="user"><a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->instance->pageid.'" title="'.$timeago.'">';
-                $this->content->text .= print_user_picture($user, $this->instance->pageid, $user->picture, 0, true, false, '', false);
+                $this->content->text .= '<li class="listentry"><div class="user"><a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.SITEID.'" title="'.$timeago.'">';
+                $this->content->text .= print_user_picture($user, SITEID, $user->picture, 0, true, false, '', false);
                 $this->content->text .= fullname($user).'</a></div>';
                 $this->content->text .= '<div class="message"><a href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\'; return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'.$CFG->pixpath.'/t/message.gif" alt="" />&nbsp;'.$user->count.'</a>';
                 $this->content->text .= '</div></li>';