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

… into MOODLE_29_STABLE
moodle · Aug 17, 2015 · 5e325f5 · 5e325f5
2 parents b4173ea + a73b020
commit 5e325f5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php
@@ -216,6 +216,11 @@ public static function reset_all_data($detectchanges = false) {
         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();