diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-23 21:15:16 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-23 21:15:16 -0700 |
| commit | 5fb0434a478051f77ab241f62656ad941225c397 (patch) | |
| tree | 4404919523317d735f8020c7be718389f2891a9f | |
| parent | 68411cc903a1fedd5014763f55f3925c5a971b0f (diff) | |
Clean up the rss feed for the slideshow. It now validates using "http://validator.w3.org/feed/". Fixes ticket #806. Doesn't fix ticket#23.
| -rw-r--r-- | modules/rss/controllers/rss.php | 8 | ||||
| -rw-r--r-- | modules/rss/views/feed.mrss.php | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php index 015d6032..1ecec9af 100644 --- a/modules/rss/controllers/rss.php +++ b/modules/rss/controllers/rss.php @@ -52,12 +52,14 @@ class Rss_Controller extends Controller { $view->feed = $feed; $view->pub_date = date("D, d M Y H:i:s T"); - $feed->uri = url::abs_site(Router::$current_uri); + $feed->uri = url::abs_site(str_replace("&", "&", url::merge($_GET))); if ($page > 1) { - $feed->previous_page_uri = url::abs_site(url::merge(array("page" => $page - 1))); + $feed->previous_page_uri = + url::abs_site(str_replace("&", "&", url::merge(array("page" => $page - 1)))); } if ($page < $feed->max_pages) { - $feed->next_page_uri = url::abs_site(url::merge(array("page" => $page + 1))); + $feed->next_page_uri = + url::abs_site(str_replace("&", "&", url::merge(array("page" => $page + 1)))); } rest::http_content_type(rest::RSS); diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php index 3612cbc0..89ba9f14 100644 --- a/modules/rss/views/feed.mrss.php +++ b/modules/rss/views/feed.mrss.php @@ -26,6 +26,7 @@ <link><?= url::abs_site("{$child->type}s/{$child->id}") ?></link> <guid isPermaLink="true"><?= url::abs_site("{$child->type}s/{$child->id}") ?></guid> <pubDate><?= date("D, d M Y H:i:s T", $child->created); ?></pubDate> + <description><?= html::purify($child->description) ?></description> <content:encoded> <![CDATA[ <span><?= html::purify($child->description) ?></span> @@ -45,7 +46,6 @@ ]]> </content:encoded> <media:thumbnail url="<?= $child->thumb_url(true) ?>" - fileSize="<?= @filesize($child->thumb_path()) ?>" height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" /> |