Merge branch 'fix-author-fallback' into 'nightly'

[quix0rs-gnu-social.git] / actions / apisearchatom.php

diff --git a/actions/apisearchatom.php b/actions/apisearchatom.php
index fdf95f1ce9fdcd8bc5290ba8d078ca8d82f25f52..7e79808a9630aeeee13ca5e11ff3c5417b424456 100644 (file)
--- a/actions/apisearchatom.php
+++ b/actions/apisearchatom.php
@@ -327,7 +327,7 @@ class ApiSearchAtomAction extends ApiPrivateAuthAction
                                      'rel'  => 'alternate',
                                      'href' => $nurl));
         $this->element('title', null, common_xml_safe_str(trim($notice->content)));
-        $this->element('content', array('type' => 'html'), $notice->rendered);
+        $this->element('content', array('type' => 'html'), $notice->getRendered());
         $this->element('updated', null, common_date_w3dtf($notice->created));
         $this->element('link', array('type' => 'image/png',
                                      // XXX: Twitter uses rel="image" (not valid)
@@ -339,7 +339,7 @@ class ApiSearchAtomAction extends ApiPrivateAuthAction
         $source = null;
 
         $ns = $notice->getSource();
-        if ($ns) {
+        if ($ns instanceof Notice_source) {
             if (!empty($ns->name) && !empty($ns->url)) {
                 $source = '<a href="'
                    . htmlspecialchars($ns->url)