From 2f7076ebf2c3d107466925979022deade822272b Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 20 Nov 2018 09:02:16 +0800 Subject: [PATCH] MDL-63692 message: Resolve bad merge conflict --- message/classes/api.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/message/classes/api.php b/message/classes/api.php index 3545f46aed9..68e290b5998 100644 --- a/message/classes/api.php +++ b/message/classes/api.php @@ -944,7 +944,12 @@ class api { } $ufservice = \core_favourites\service_factory::get_service_for_user_context($userctx); - return $ufservice->create_favourite('core_message', 'message_conversations', $conversationid, $conversationctx); + + if ($favourite = $ufservice->get_favourite('core_message', 'message_conversations', $conversationid, $conversationctx)) { + return $favourite; + } else { + return $ufservice->create_favourite('core_message', 'message_conversations', $conversationid, $conversationctx); + } } /**