From 3e6ba7acc3291f2268cbe9c9bef0a492b557babb Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 4 Oct 2009 00:27:22 -0600
Subject: Renamed most, if not all css selectors from gName to g-name. Moved a
 few shared images from wind to lib. Deleted unused images in the admin_wind.
 This will likely break a few ajax features.

---
 modules/rss/views/rss_block.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/rss/views')

diff --git a/modules/rss/views/rss_block.html.php b/modules/rss/views/rss_block.html.php
index 737731b6..210c72a5 100644
--- a/modules/rss/views/rss_block.html.php
+++ b/modules/rss/views/rss_block.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="gFeeds">
+<ul id="g-feeds">
 <? foreach($feeds as $url => $title): ?>
   <li style="clear: both;">
     <span class="ui-icon-left">
-- 
cgit v1.2.3


From 5fb0434a478051f77ab241f62656ad941225c397 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 21:15:16 -0700
Subject: 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.

---
 modules/rss/controllers/rss.php | 8 +++++---
 modules/rss/views/feed.mrss.php | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules/rss/views')

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("&", "&amp;", 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("&", "&amp;", 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("&", "&amp;", 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 ?>"
                        />
-- 
cgit v1.2.3


From d12555de9a93945b4fffe4b0f8f477bfd1563568 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 15 Nov 2009 18:54:12 -0800
Subject: Don't show resizes for albums, only for photos. Fixes ticket #893.

---
 modules/rss/views/feed.mrss.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/rss/views')

diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index 89ba9f14..5fce8699 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -31,7 +31,7 @@
         <![CDATA[
           <span><?= html::purify($child->description) ?></span>
           <p>
-          <? if ($child->type == "photo" || $child->type == "album"): ?>
+          <? if ($child->type == "photo"): ?>
             <img alt="" src="<?= $child->resize_url(true) ?>"
                  title="<?= html::purify($child->title)->for_html_attr() ?>"
                  height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" /><br />
@@ -50,7 +50,7 @@
                        width="<?= $child->thumb_width ?>"
                        />
       <media:group>
-        <? if ($child->type == "photo" || $child->type == "album"): ?>
+        <? if ($child->type == "photo"): ?>
           <media:content url="<?= $child->resize_url(true) ?>"
                          fileSize="<?= @filesize($child->resize_path()) ?>"
                          type="<?= $child->mime_type ?>"
-- 
cgit v1.2.3