Skip to content
Browse files

Merge branch 'MDL-31835_recent_conversations_22' of git://github.com/…

…andyjdavis/moodle into MOODLE_22_STABLE
  • Loading branch information...
2 parents fb2e8f8 + c232e12 commit 3905c1f75b3fa07426049d13ad4345b0723e8475 @samhemelryk samhemelryk committed
Showing with 7 additions and 0 deletions.
  1. +1 −0 lang/en/message.php
  2. +6 −0 message/lib.php
View
1 lang/en/message.php
@@ -128,6 +128,7 @@
$string['settingssaved'] = 'Your settings have been saved';
$string['showmessagewindow'] = 'Popup window on new message';
$string['strftimedaydatetime'] = '%A, %d %B %Y, %I:%M %p';
+$string['thisconversation'] = 'this conversation';
$string['timenosee'] = 'Minutes since I was last seen online';
$string['timesent'] = 'Time sent';
$string['touserdoesntexist'] = 'You can not send a message to a user id ({$a}) that doesn\'t exist';
View
6 message/lib.php
@@ -816,6 +816,12 @@ function message_print_recent_conversations($user=null, $showicontext=false) {
$conversations = message_get_recent_conversations($user);
+ // Attach context url information to create the "View this conversation" type links
+ foreach($conversations as $conversation) {
+ $conversation->contexturl = new moodle_url("/message/index.php?user2={$conversation->id}");
+ $conversation->contexturlname = get_string('thisconversation', 'message');
+ }
+
$showotheruser = true;
message_print_recent_messages_table($conversations, $user, $showotheruser, $showicontext);
}

0 comments on commit 3905c1f

Please sign in to comment.
Something went wrong with that request. Please try again.