Merge branch 'MDL-51077-m29' of git://github.com/sammarshallou/moodle into MOODLE_29_STABLE

2015-08-17 09:46:38 +08:00
parent b4173ea1ad a73b0208ea
commit 5e325f5dce
1 changed files with 5 additions and 0 deletions
@@ -216,6 +216,11 @@ class phpunit_util extends testing_util {
        filter_manager::reset_caches();
        core_filetypes::reset_caches();

+        // Reset static unit test options.
+        if (class_exists('\availability_date\condition', false)) {
+            \availability_date\condition::set_current_time_for_test(0);
+        }
+
        // Reset internal users.
        core_user::reset_internal_users();