From 61f8af6e4cd33a6e226221fd81fcfe2e5afa1081 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 16 Feb 2010 21:56:56 -0800
Subject: Fix for ticket #1020: Fix RSS feed validation of album / recent items
 feeds.

---
 modules/rss/views/feed.mrss.php | 46 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'modules/rss')

diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index cdb4f0f0..0fd8095d 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -49,32 +49,30 @@
                        height="<?= $child->thumb_height ?>"
                        width="<?= $child->thumb_width ?>"
                        />
+    <? $view_full = access::can("view_full", $child); ?>
+    <? if ($child->type == "photo" && $view_full): ?>
       <media:group>
-        <? if ($child->type == "photo"): ?>
-          <media:content url="<?= $child->resize_url(true) ?>"
-                         fileSize="<?= @filesize($child->resize_path()) ?>"
-                         type="<?= $child->mime_type ?>"
-                         height="<?= $child->resize_height ?>"
-                         width="<?= $child->resize_width ?>"
-                         />
-          <? 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 ?>"
-                           isDefault="true"
-                           />
-          <? endif ?>
-        <? else: ?>
-          <media:content url="<?= $child->file_url(true) ?>"
-                         fileSize="<?= @filesize($child->file_path()) ?>"
-                         height="<?= $child->height ?>"
-                         width="<?= $child->width ?>"
-                         type="<?= $child->mime_type ?>"
-                         />
-        <? endif ?>
+    <? endif ?>
+      <? if ($child->type == "photo"): ?>
+        <media:content url="<?= $child->resize_url(true) ?>"
+                       fileSize="<?= @filesize($child->resize_path()) ?>"
+                       type="<?= $child->mime_type ?>"
+                       height="<?= $child->resize_height ?>"
+                       width="<?= $child->resize_width ?>"
+                       />
+      <? endif ?>
+      <? if ($view_full): ?>
+        <media:content url="<?= $child->file_url(true) ?>"
+                       fileSize="<?= @filesize($child->file_path()) ?>"
+                       type="<?= $child->mime_type ?>"
+                       height="<?= $child->height ?>"
+                       width="<?= $child->width ?>"
+                       isDefault="true"
+                       />
+      <? endif ?>
+    <? if ($child->type == "photo" && $view_full): ?>
       </media:group>
+    <? endif ?>
     </item>
     <? endforeach ?>
   </channel>
-- 
cgit v1.2.3