Merge branch 'w26_MDL-39701_m26_filterupgrade' of git://github.com/skodak/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2013-06-26 12:30:41 +02:00
commit 26568ba865

View File

@ -1296,7 +1296,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);
}