commit 44157d664e058069643553f1a1c503a90c2cceb9
Author: Hugh Davenport <hugh@catalyst.net.nz>
Date:   Fri Sep 7 12:04:45 2012 +1200

    Fix XML Security bug
    
    TODO more details
    
    Change-Id: I881842545772eebb2a3805e80db0d477ea4a001e
    Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
    
    Conflicts:
    	htdocs/blocktype/externalfeed/db/upgrade.php
    	htdocs/blocktype/externalfeed/version.php

diff --git a/htdocs/blocktype/externalfeed/db/upgrade.php b/htdocs/blocktype/externalfeed/db/upgrade.php
index 8415c7d..a52c151 100644
--- a/htdocs/blocktype/externalfeed/db/upgrade.php
+++ b/htdocs/blocktype/externalfeed/db/upgrade.php
@@ -61,6 +61,13 @@ function xmldb_blocktype_externalfeed_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2009121601) {
+        // Reset all feeds to reset themselves
+        set_field('blocktype_externalfeed_data', 'lastupdate', '0');
+        safe_require('blocktype', 'externalfeed');
+        call_static_method('PluginBlocktypeExternalfeed', 'refresh_feeds');
+    }
+
     return true;
 }
 
diff --git a/htdocs/blocktype/externalfeed/version.php b/htdocs/blocktype/externalfeed/version.php
index 9e1f925..4a2da30 100644
--- a/htdocs/blocktype/externalfeed/version.php
+++ b/htdocs/blocktype/externalfeed/version.php
@@ -28,7 +28,7 @@
 defined('INTERNAL') || die();
 
 $config = new StdClass;
-$config->version = 2009121600;
+$config->version = 2009121601;
 $config->release = '1.0.2';
 
 ?>
diff --git a/htdocs/init.php b/htdocs/init.php
index 02a1dd8..7601a67 100644
--- a/htdocs/init.php
+++ b/htdocs/init.php
@@ -56,6 +56,8 @@ if (!is_readable($CFG->docroot . 'config.php')) {
 
 init_performance_info();
 
+libxml_disable_entity_loader(true);
+
 require($CFG->docroot . 'config.php');
 $CFG = (object)array_merge((array)$cfg, (array)$CFG);
 require_once('config-defaults.php');