Fixup rendering of event and RSVP

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 0cb62cf59e1ecfad98e43d5e0454d89c5360b851..a9644e7a2ccc12b00ab36569625fbf80226387d3 100644 (file)
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -296,6 +296,7 @@ class EventPlugin extends MicroappPlugin
             return new RSVPListItem($nli);
             break;
         }
+        return null;
     }
 
 

diff --git a/plugins/Event/eventlistitem.php b/plugins/Event/eventlistitem.php
index 3d2d3ecd8f0276748ec90f397b20abe5e946102b..a6bfc13cbd727dd5d20b37d2d82ebcf9a723cdcb 100644 (file)
--- a/plugins/Event/eventlistitem.php
+++ b/plugins/Event/eventlistitem.php
@@ -55,7 +55,7 @@ class EventListItem extends NoticeListItemAdapter
         $this->nli->out->elementEnd('div');
     }
 
-    function showEventNotice($notice, $out)
+    function showContent($notice, $out)
     {
         $profile = $notice->getProfile();
         $event   = Happening::fromNotice($notice);

diff --git a/plugins/Event/rsvplistitem.php b/plugins/Event/rsvplistitem.php
index 4ca36a94471169754fbc7ae8285bbc0e4c179a73..4d7d785e885308e7102d497600b3427678b3874b 100644 (file)
--- a/plugins/Event/rsvplistitem.php
+++ b/plugins/Event/rsvplistitem.php
@@ -47,7 +47,15 @@ if (!defined('STATUSNET')) {
 
 class RSVPListItem extends NoticeListItemAdapter
 {
-    function showRSVPNotice($notice, $out)
+    function showNotice()
+    {
+        $this->nli->out->elementStart('div', 'entry-title');
+        $this->nli->showAuthor();
+        $this->showContent();
+        $this->nli->out->elementEnd('div');
+    }
+
+    function showContent($notice, $out)
     {
         $rsvp = RSVP::fromNotice($notice);