From 27833958afc4d9d54460bd5273a6a56d94c1923f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 29 Jan 2012 20:03:50 +0000
Subject: added tpl_getMediaFile() to replace tpl_getFavicon()

The function tpl_getFavicon() was doing more than its name was implying. Therefore the new tpl_getMediaFile() was introduced (which is doing nearly exactly the same) and tpl_getFavicon() was deprecated.
tpl_favicon() can still be used, though.
---
 feed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'feed.php')

diff --git a/feed.php b/feed.php
index 298777eb9..a7fa95620 100644
--- a/feed.php
+++ b/feed.php
@@ -50,7 +50,7 @@ $rss->cssStyleSheet  = DOKU_URL.'lib/exe/css.php?s=feed';
 
 $image = new FeedImage();
 $image->title = $conf['title'];
-$image->url = tpl_getFavicon(true);
+$image->url = tpl_getMediaFile('favicon.ico', true);
 $image->link = DOKU_URL;
 $rss->image = $image;
 
-- 
cgit v1.2.3


From a7c93226bd0fa1293e1dc99e679390dc2f8d803c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 2 Mar 2012 08:08:29 +0100
Subject: make RSS contents (media/pages) configurable

---
 feed.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'feed.php')

diff --git a/feed.php b/feed.php
index a7fa95620..98d5ef2e8 100644
--- a/feed.php
+++ b/feed.php
@@ -117,8 +117,8 @@ function rss_parseOptions(){
                   'show_minor'   => array('minor', false),
                   // String, only used in search mode
                   'search_query' => array('q', null),
-                // One of: pages, media, both
-                  'content_type' => array('view', 'both')
+                  // One of: pages, media, both
+                  'content_type' => array('view', $conf['rss_media'])
 
                  ) as $name => $val) {
         $opt[$name] = (isset($_REQUEST[$val[0]]) && !empty($_REQUEST[$val[0]]))
-- 
cgit v1.2.3