From 75a1e85e3a31d8e4d74c1908615f1cdde99463ff Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 12 Apr 2015 12:37:32 +1200 Subject: [PATCH] MDL-49828 timezones: fix messed up phpunit detection --- lib/classes/date.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/classes/date.php b/lib/classes/date.php index 3ced6b6adef..c2d7b664a3d 100644 --- a/lib/classes/date.php +++ b/lib/classes/date.php @@ -296,7 +296,8 @@ class core_date { * To be called from lib/setup.php only! */ public static function store_default_php_timezone() { - if (defined('PHPUNIT_TEST') or defined('BEHAT_SITE_RUNNING') or defined('BEHAT_TEST') or defined('BEHAT_UTIL')) { + if ((defined('PHPUNIT_TEST') and PHPUNIT_TEST) + or defined('BEHAT_SITE_RUNNING') or defined('BEHAT_TEST') or defined('BEHAT_UTIL')) { // We want all test sites to be consistent by default. self::$defaultphptimezone = 'Australia/Perth'; return;