Merge mmn's 'nightly' changes

[quix0rs-gnu-social.git] / plugins / Event / classes / RSVP.php

diff --git a/plugins/Event/classes/RSVP.php b/plugins/Event/classes/RSVP.php
index 31ccf439ef9ac0812b4123ffa6d9208ddd4003f5..de3307fad4e4352ef6ca1c4bc3cfbc967e6e00e0 100644 (file)
--- a/plugins/Event/classes/RSVP.php
+++ b/plugins/Event/classes/RSVP.php
@@ -226,7 +226,12 @@ class RSVP extends Managed_DataObject
 
     static function fromNotice(Notice $notice)
     {
-        return RSVP::getKV('uri', $notice->uri);
+        $rsvp = new RSVP();
+        $rsvp->uri = $notice->uri;
+        if (!$rsvp->find(true)) {
+            throw new NoResultException($rsvp);
+        }
+        return $rsvp;
     }
 
     static function forEvent(Happening $event)