Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle

Conflicts: lib/db/install.xml lib/db/upgrade.php version.php
2013-10-09 15:58:45 +13:00
parent e9091a28f5 5e5923ea28
commit f18f96f767
20 changed files with 465 additions and 344 deletions
@@ -201,9 +201,6 @@ class phpunit_util extends testing_util {
        events_get_handlers('reset');
        core_text::reset_caches();
        get_message_processors(false, true);
-        if (class_exists('repository')) {
-            repository::reset_caches();
-        }
        filter_manager::reset_caches();
        //TODO MDL-25290: add more resets here and probably refactor them to new core function