L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-49371_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2015-03-17 09:06:59 +00:00
parent 9db120e338 bdc83277a3
commit 1fbc0e5f43
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/deprecatedlib.php
+26
View File
@@ -4100,3 +4100,29 @@ function enrol_cohort_search_cohorts(course_enrolment_manager $manager, $offset
}
return array('more' => !(bool)$limit, 'offset' => $offset, 'cohorts' => $cohorts);
}
/**
* Is $USER one of the supplied users?
*
* $user2 will be null if viewing a user's recent conversations
*
* @deprecated since Moodle 2.9 MDL-49371 - please do not use this function any more.
* @todo MDL-49290 This will be deleted in Moodle 3.1.
* @param stdClass the first user
* @param stdClass the second user or null
* @return bool True if the current user is one of either $user1 or $user2
*/
function message_current_user_is_involved($user1, $user2) {
global $USER;
debugging('message_current_user_is_involved() is deprecated, please do not use this function.', DEBUG_DEVELOPER);
if (empty($user1->id) || (!empty($user2) && empty($user2->id))) {
throw new coding_exception('Invalid user object detected. Missing id.');
}
if ($user1->id != $USER->id && (empty($user2) || $user2->id != $USER->id)) {
return false;
}
return true;
}
message/lib.php
-22
View File
@@ -2617,28 +2617,6 @@ function message_page_type_list($pagetype, $parentcontext, $currentcontext) {
return array('messages-*'=>get_string('page-message-x', 'message'));
}
/**
* Is $USER one of the supplied users?
*
* $user2 will be null if viewing a user's recent conversations
*
* @param stdClass the first user
* @param stdClass the second user or null
* @return bool True if the current user is one of either $user1 or $user2
*/
function message_current_user_is_involved($user1, $user2) {
global $USER;
if (empty($user1->id) || (!empty($user2) && empty($user2->id))) {
throw new coding_exception('Invalid user object detected. Missing id.');
}
if ($user1->id != $USER->id && (empty($user2) || $user2->id != $USER->id)) {
return false;
}
return true;
}
/**
* Get messages sent or/and received by the specified users.
*