summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doku.php2
-rw-r--r--inc/format.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/doku.php b/doku.php
index 4cda1b304..aa38b95cc 100644
--- a/doku.php
+++ b/doku.php
@@ -1,5 +1,5 @@
<?php
- define('DOKUWIKIVERSION','2004-01-12');
+ define('DOKUWIKIVERSION','2004-01-13');
ini_set('short_open_tag',"1");
require_once("conf/dokuwiki.php");
diff --git a/inc/format.php b/inc/format.php
index 806ea5010..68f15fe12 100644
--- a/inc/format.php
+++ b/inc/format.php
@@ -325,6 +325,7 @@ function format_link_media($link){
*/
function format_rss($url){
global $lang;
+ define('MAGPIE_CACHE_ON', false); //we do our own caching
define('MAGPIE_DIR', 'inc/magpie/');
require_once(MAGPIE_DIR.'/rss_fetch.inc');