Merge branch 'wip-mdl-48670-m27' of https://github.com/rajeshtaneja/moodle into MOODLE_27_STABLE

2015-02-17 14:06:45 +08:00
parent 71ae878ca9 5fe6298a05
commit 73d3d0d37f
1 changed files with 5 additions and 0 deletions
@@ -133,6 +133,11 @@ if (defined('BEHAT_SITE_RUNNING')) {
    }
 }

+// Force timezone to be Australia/Perth for behat tests, so we don't get time zone problems.
+if (defined('BEHAT_SITE_RUNNING') || defined('BEHAT_TEST') || defined('BEHAT_UTIL')) {
+    @date_default_timezone_set('Australia/Perth');
+}
+
 // Normalise dataroot - we do not want any symbolic links, trailing / or any other weirdness there
 if (!isset($CFG->dataroot)) {
    if (isset($_SERVER['REMOTE_ADDR'])) {