filters: MDL-7336 Set ->stringfilters on upgrade

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index c7cc88996de4bcefa9bc38fa59713f367f403840..a9bd56ddebbcc1128d571be1210e834b3fa4bfb0 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -1623,6 +1623,23 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         upgrade_main_savepoint($result, 2009040302);
     }
 
+    if ($result && $oldversion < 2009040600) {
+    /// Ensure that $CFG->stringfilters is set.
+        if (empty($CFG->stringfilters)) {
+            if (!empty($CFG->filterall)) {
+                set_config('stringfilters', $CFG->textfilters);
+            } else {
+                set_config('stringfilters', '');
+            }
+        }
+
+        set_config('filterall', !empty($CFG->stringfilters));
+        unset_config('textfilters');
+
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2009040600);
+    }
+
     return $result;
 }
 

diff --git a/version.php b/version.php
index 910d18e47a6d01c31f88e7633606b77d565331a0..d5f048d4a673c2d63918e545a278f1e8e36aac71 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2009040303;  // YYYYMMDD   = date of the last version bump
+    $version = 2009040600;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20090413)';  // Human-friendly version name