Merge branch 'MDL-51893' of git://github.com/stronk7/moodle
This commit is contained in:
@@ -537,7 +537,6 @@ class core_date {
|
||||
self::$badzones['5.5'] = 'Asia/Kolkata';
|
||||
self::$badzones['6.5'] = 'Asia/Rangoon';
|
||||
self::$badzones['9.5'] = 'Australia/Darwin';
|
||||
self::$badzones['11.5'] = 'Pacific/Norfolk';
|
||||
|
||||
// Remove bad zones that are elsewhere.
|
||||
foreach (self::$bczones as $zone => $unused) {
|
||||
|
||||
@@ -154,8 +154,6 @@ class core_date_legacy_testcase extends advanced_testcase {
|
||||
$this->assertEquals(60 * 60 * 6.5, get_timezone_offset('Asia/Rangoon'));
|
||||
$this->assertEquals(60 * 60 * 9.5, get_timezone_offset('9.5'));
|
||||
$this->assertEquals(60 * 60 * 9.5, get_timezone_offset('Australia/Darwin'));
|
||||
$this->assertEquals(60 * 60 * 11.5, get_timezone_offset('11.5'));
|
||||
$this->assertEquals(60 * 60 * 11.5, get_timezone_offset('Pacific/Norfolk'));
|
||||
|
||||
$this->resetDebugging();
|
||||
}
|
||||
|
||||
@@ -83,7 +83,6 @@ class core_date_testcase extends advanced_testcase {
|
||||
$this->assertSame('Asia/Kolkata', core_date::normalise_timezone(5.5));
|
||||
$this->assertSame('Asia/Rangoon', core_date::normalise_timezone(6.5));
|
||||
$this->assertSame('Australia/Darwin', core_date::normalise_timezone('9.5'));
|
||||
$this->assertSame('Pacific/Norfolk', core_date::normalise_timezone('11.5'));
|
||||
|
||||
$this->setTimezone('99', 'Pacific/Auckland');
|
||||
$this->assertSame('Pacific/Auckland', core_date::normalise_timezone('Pacific/Auckland'));
|
||||
|
||||
Reference in New Issue
Block a user