Merge branch 'w26_MDL-39701_m25_filterupgrade' of git://github.com/skodak/moodle into MOODLE_25_STABLE

lib/weblib.php

@@ -1290,7 +1290,7 @@ function format_string($string, $striplinks = true, $options = NULL) {
     //We'll use a in-memory cache here to speed up repeated strings
     static $strcache = false;
 
-    if (empty($CFG->version) or $CFG->version < 2010072800 or during_initial_install()) {
+    if (empty($CFG->version) or $CFG->version < 2013051400 or during_initial_install()) {
         // do not filter anything during installation or before upgrade completes
         return $string = strip_tags($string);
     }