tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.1' into 3.2

Browse Source
This commit is contained in:
Daniel Hensby 2016-11-23 21:54:22 +00:00
commit 17eb351f81
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/SapphireTest.php
View File

@ -192,8 +192,6 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
// i18n needs to be set to the defaults or tests fail // i18n needs to be set to the defaults or tests fail
i18n::set_locale(i18n::default_locale()); i18n::set_locale(i18n::default_locale());
i18n::config()->date_format = null;
i18n::config()->time_format = null;
// Set default timezone consistently to avoid NZ-specific dependencies // Set default timezone consistently to avoid NZ-specific dependencies
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');