Merge branch 'input-validation' of git://github.com/whoopdedo/dokuwiki into pull-request-110

* 'input-validation' of git://github.com/whoopdedo/dokuwiki:
  fix incorrect usage of tpl_getMediaFile
  fix necessary global declaration
  Input wrapper for html forms
  Input validation for media manager
  Input wrapper for exe scripts
  more INPUT wrapper uses: cache purge, sectok, getID
  Input wrapper for action.php

Conflicts:
	lib/exe/css.php

1 files changed, 1 insertions, 1 deletions

diff --git a/feed.php b/feed.php
index b8db5387f..6ad371f1e 100644
--- a/feed.php
+++ b/feed.php
@@ -53,7 +53,7 @@ $rss->cssStyleSheet  = DOKU_URL.'lib/exe/css.php?s=feed';
 
 $image        = new FeedImage();
 $image->title = $conf['title'];
-$image->url   = tpl_getMediaFile('favicon.ico', true);
+$image->url   = tpl_getMediaFile(array(':wiki:favicon.ico', ':favicon.ico', 'images/favicon.ico'), true);
 $image->link  = DOKU_URL;
 $rss->image   = $image;