From 03a1f367a2e088f81d8bbed7f5a7bc8b53bf08ee Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 9 Apr 2014 13:38:14 -0700 Subject: [PATCH] Revert "CRM-14423 - Call setMySQLTimeZone as part of Civi's bootstrap" This reverts commit 309cd470a1c69b44b2d4c0651b62950a7223ddcc. --- CRM/Core/Config.php | 1 - tests/phpunit/CiviTest/CiviUnitTestCase.php | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php index aa9c708eb1..d572964731 100644 --- a/CRM/Core/Config.php +++ b/CRM/Core/Config.php @@ -257,7 +257,6 @@ class CRM_Core_Config extends CRM_Core_Config_Variables { array(1 => array($userID, 'Integer')) ); } - self::$_singleton->userSystem->setMySQLTimeZone(); // initialize authentication source self::$_singleton->initAuthSrc(); diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index dfb8eb12ae..f28677abd2 100644 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php @@ -306,6 +306,9 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { // also set this global hack $GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array(); + + $env = new CRM_Utils_Check_Env(); + CRM_Utils_Check::singleton()->assertValid($env->checkAll()); } /** @@ -350,11 +353,6 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { // reset all the caches CRM_Utils_System::flushCache(); - // Make sure the DB connection is setup properly - $config->userSystem->setMySQLTimeZone(); - $env = new CRM_Utils_Check_Env(); - CRM_Utils_Check::singleton()->assertValid($env->checkAll()); - // clear permissions stub to not check permissions $config = CRM_Core_Config::singleton(); $config->userPermissionClass->permissions = NULL; -- 2.25.1