Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / classes / Conversation.php

diff --git a/classes/Conversation.php b/classes/Conversation.php
index 537c214a4c21991b54a20fea942a5c6a0ff2c325..9ef1e06b76a73d14d789c580dd8b6652553baf84 100644 (file)
--- a/classes/Conversation.php
+++ b/classes/Conversation.php
@@ -110,8 +110,7 @@ class Conversation extends Managed_DataObject
     {
         $conv = new Conversation();
         $conv->id = $notice->conversation;
-        $conv->find(true);
-        if (!$conv instanceof Conversation) {
+        if (!$conv->find(true)) {
             common_debug('Conversation does not exist for notice ID: '.$notice->id);
             throw new NoResultException($conv);
         }