Avoid having to check for notices without rendered copies in upgrade.php

[quix0rs-gnu-social.git] / plugins / Activity / lib / systemlistitem.php

diff --git a/plugins/Activity/lib/systemlistitem.php b/plugins/Activity/lib/systemlistitem.php
index c6753e5ff198fe124fc2809a1292204795bc8ae2..661fd1fe4ca2eeaa591eaaf51b72a1a45e59ef93 100644 (file)
--- a/plugins/Activity/lib/systemlistitem.php
+++ b/plugins/Activity/lib/systemlistitem.php
@@ -68,7 +68,7 @@ class SystemListItem extends NoticeListItemAdapter
 
         $out->elementStart('div', 'system-activity');
 
-        $out->raw($notice->rendered);
+        $out->raw($notice->getRendered());
 
         $out->elementEnd('div');
     }
@@ -79,8 +79,10 @@ class SystemListItem extends NoticeListItemAdapter
             $user = common_current_user();
             if (!empty($user)) {
                 $this->nli->out->elementStart('div', 'notice-options');
-                $this->showFaveForm();
-                $this->showReplyLink();
+                if (Event::handle('StartShowNoticeOptionItems', array($this))) {
+                    $this->showReplyLink();
+                    Event::handle('EndShowNoticeOptionItems', array($this));
+                }
                 $this->nli->out->elementEnd('div');
             }
             Event::handle('EndShowNoticeOptions', array($this));