Don't accept non-objects before testing with "instanceof".

[quix0rs-gnu-social.git] / lib / dofollowlistitem.php

diff --git a/lib/dofollowlistitem.php b/lib/dofollowlistitem.php
index 80e2d0b0a792f3a76b8977a04f44b7caf1f52a22..f65f7b4cbbe25b3e633261d00292548d39803069 100644 (file)
--- a/lib/dofollowlistitem.php
+++ b/lib/dofollowlistitem.php
@@ -66,13 +66,9 @@ class DoFollowListItem extends NoticeListItem
     function showContent()
     {
         // FIXME: URL, image, video, audio
-        $this->out->elementStart('p', array('class' => 'entry-content'));
+        $this->out->elementStart('article', array('class' => 'e-content'));
 
-        if (!empty($this->notice->rendered)) {
-            $html = $this->notice->rendered;
-        } else {
-            $html = common_render_content($this->notice->content, $this->notice);
-        }
+        $html = $this->notice->getRendered();
 
         if (common_config('nofollow', 'external') == 'sometimes') {
             // remove the nofollow part
@@ -83,6 +79,6 @@ class DoFollowListItem extends NoticeListItem
 
         $this->out->raw($html);
 
-        $this->out->elementEnd('p');
+        $this->out->elementEnd('div');
     }
-}
\ No newline at end of file
+}