From 3ced35929cd844328afd445756237e43b907be02 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 23 Feb 2009 04:08:26 +0000
Subject: Fix broken slideshow

---
 modules/rss/views/feed.mrss.php | 48 ++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 17 deletions(-)

(limited to 'modules/rss')

diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index fbcd415e..757d5dcd 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -25,14 +25,20 @@
       <title><?= htmlspecialchars($child->title) ?></title>
       <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->createdb); ?></pubDate>
+      <pubDate><?= date("D, d M Y H:i:s T", $child->created); ?></pubDate>
       <content:encoded>
         <![CDATA[
           <span><?= $child->description ?></span>
           <p>
+          <? if ($child->type == "photo" || $child->type == "album"): ?>
             <img alt="" src="<?= $child->resize_url(true) ?>"
                  title="<?= htmlspecialchars($child->title) ?>"
                  height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" /><br />
+          <? else: ?>
+            <img alt="" src="<?= $child->thumb_url(true) ?>"
+                 title="<?= htmlspecialchars($child->title) ?>"
+                 height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" /><br />
+          <? endif ?>
             <?= $child->description ?>
           </p>
         ]]>
@@ -43,22 +49,30 @@
                        width="<?= $child->thumb_width ?>"
                        />
       <media:group>
-        <media:content url="<?= $child->resize_url(true) ?>"
-                       fileSize="<?= filesize($child->resize_path()) ?>"
-                       type="<?= $child->mime_type ?>"
-                       height="<?= $child->resize_height ?>"
-                       width="<?= $child->resize_width ?>"
-                       isDefault="true"
-                       />
-       <? if (access::can("view_full", $child)): ?>
-       <media:content url="<?= $child->file_url(true) ?>"
-          
-                       fileSize="<?= filesize($child->file_path()) ?>"
-                       type="<?= $child->mime_type ?>"
-                       height="<?= $child->height ?>"
-                       width="<?= $child->width ?>"
-                       />
-       <? endif ?>
+        <? if ($child->type == "photo" || $child->type == "album"): ?>
+          <media:content url="<?= $child->resize_url(true) ?>"
+                         fileSize="<?= filesize($child->resize_path()) ?>"
+                         type="<?= $child->mime_type ?>"
+                         height="<?= $child->resize_height ?>"
+                         width="<?= $child->resize_width ?>"
+                         isDefault="true"
+                         />
+          <? if (access::can("view_full", $child)): ?>
+            <media:content url="<?= $child->file_url(true) ?>"
+                           fileSize="<?= filesize($child->file_path()) ?>"
+                           type="<?= $child->mime_type ?>"
+                           height="<?= $child->height ?>"
+                           width="<?= $child->width ?>"
+                           />
+          <? endif ?>
+        <? else: ?>
+          <media:content url="<?= $child->file_url(true) ?>"
+                         fileSize="<?= filesize($child->file_path()) ?>"
+                         type="<?= $child->mime_type ?>"
+                         height="<?= $child->height ?>"
+                         width="<?= $child->width ?>"
+                         />
+        <? endif ?>
       </media:group>
     </item>
     <? endforeach ?>
-- 
cgit v1.2.3