diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-17 06:46:48 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-17 06:46:48 -0800 |
| commit | 74472dc83ca897423c630dce0d1d7e3b13bb0b5f (patch) | |
| tree | 4cac66304fcc8346ad238d2cda123160b65f3eb3 /modules/rss | |
| parent | eb1cdd037646b3697b64753652669fa9e25a5c8e (diff) | |
| parent | 4ca55a90ee2f8e1d8595b0ec53a601d6c65475f6 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/rss')
| -rw-r--r-- | modules/rss/views/feed.mrss.php | 46 |
1 files changed, 22 insertions, 24 deletions
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> |