MDL-63692 message: Resolve bad merge conflict

2018-11-20 09:04:53 +08:00
parent 08cd15658a
commit 2f7076ebf2
1 changed files with 6 additions and 1 deletions
@@ -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);
+        }
    }

    /**