Fix to previous fix :(

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

diff --git a/lib/rssaction.php b/lib/rssaction.php
index 4d696de03e5398a9f0d69802d5776460fa532233..0152f25bc76acc9ff7a3edd44df484ff22eabc4b 100644 (file)
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -25,6 +25,10 @@ class Rss10Action extends Action {
 
        # This will contain the details of each feed item's author and be used to generate SIOC data.
        var $creators = array();
+
+       function is_readonly() {
+               return true;
+       }
        
        function handle($args) {
                parent::handle($args);
@@ -119,13 +123,14 @@ class Rss10Action extends Action {
                $nurl = common_local_url('shownotice', array('notice' => $notice->id));
                $creator_uri = common_profile_uri($profile);
                common_element_start('item', array('rdf:about' => $notice->uri));
-               $title = $profile->nickname . ': ' . $notice->content;
+               $title = $profile->nickname . ': ' . common_xml_safe_str($notice->content);
                common_element('title', NULL, $title);
                common_element('link', NULL, $nurl);
                common_element('description', NULL, $profile->nickname."'s status on ".common_exact_date($notice->created));
                common_element('dc:date', NULL, common_date_w3dtf($notice->created));
                common_element('dc:creator', NULL, ($profile->fullname) ? $profile->fullname : $profile->nickname);
-               common_element('sioc:has_creator', array('rdf:resource' => $creator_url));
+               common_element('sioc:has_creator', array('rdf:resource' => $creator_uri));
+               common_element('laconica:postIcon', array('rdf:resource' => common_profile_avatar_url($profile)));
                common_element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
                common_element_end('item');
                $this->creators[$creator_uri] = $profile;
@@ -166,6 +171,8 @@ class Rss10Action extends Action {
                                                                                          'http://rdfs.org/sioc/ns#',
                                                      'xmlns:sioct' =>
                                                      'http://rdfs.org/sioc/types#',
+                                                     'xmlns:laconica' =>
+                                                     'http://laconi.ca/ont/',
                                                                                          'xmlns' => 'http://purl.org/rss/1.0/'));
                
                common_element_start('sioc:Site', array('rdf:about' => common_root_url()));