From f254b2b88fa2744f0b96e9c09fc765b89bc80deb Mon Sep 17 00:00:00 2001 From: cescobedo Date: Fri, 2 Jul 2021 07:10:01 +0200 Subject: [PATCH] MDL-71917 core_message: Use $USER in WS delete_message_for_all_users --- message/externallib.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/message/externallib.php b/message/externallib.php index 7235cbdafcc..cc15748cc50 100644 --- a/message/externallib.php +++ b/message/externallib.php @@ -4858,13 +4858,13 @@ class core_message_external extends external_api { * Deletes a message for all users * * @param int $messageid the message id - * @param int $userid the user id of who we want to delete the message for all users + * @param int $userid the user id of who we want to delete the message for all users, is no longer used. * @return external_description * @throws moodle_exception * @since 3.7 */ public static function delete_message_for_all_users(int $messageid, int $userid) { - global $CFG; + global $CFG, $USER; // Check if private messaging between users is allowed. if (empty($CFG->messaging)) { @@ -4882,11 +4882,10 @@ class core_message_external extends external_api { $context = context_system::instance(); self::validate_context($context); - $user = core_user::get_user($params['userid'], '*', MUST_EXIST); - core_user::require_active_user($user); + core_user::require_active_user($USER); // Checks if a user can delete a message for all users. - if (core_message\api::can_delete_message_for_all_users($user->id, $params['messageid'])) { + if (core_message\api::can_delete_message_for_all_users($USER->id, $params['messageid'])) { \core_message\api::delete_message_for_all_users($params['messageid']); } else { throw new moodle_exception('You do not have permission to delete this message for everyone.');