Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/dofollowlistitem.php b/lib/dofollowlistitem.php
index f3e2420677a8cc24f5b18892847aa42fa2e41b06..f65f7b4cbbe25b3e633261d00292548d39803069 100644 (file)
--- a/lib/dofollowlistitem.php
+++ b/lib/dofollowlistitem.php
@@ -68,11 +68,7 @@ class DoFollowListItem extends NoticeListItem
         // FIXME: URL, image, video, audio
         $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