Merge branch 'MDL-43671_message' of https://github.com/andyjdavis/moodle

This commit is contained in:
Dan Poltawski 2014-01-20 10:53:50 +08:00
commit fa8861964a

View File

@ -114,10 +114,6 @@ $user2realuser = !empty($user2) && core_user::is_real_user($user2->id);
$showactionlinks = $showactionlinks && $user2realuser;
$systemcontext = context_system::instance();
if (!empty($user2) && $user1->id == $user2->id) {
print_error('invaliduserid');
}
// Is the user involved in the conversation?
// Do they have the ability to read other user's conversations?
if (!message_current_user_is_involved($user1, $user2) && !has_capability('moodle/site:readallmessages', $systemcontext)) {