Merge remote-tracking branch 'origin/2.1' into 2.2

This commit is contained in:
Robbie Averill 2017-06-01 14:21:37 +12:00
commit e105bc50f8

View File

@ -22,6 +22,9 @@ class TranslatableSiteConfigTest extends SapphireTest {
$this->origLocale = Translatable::default_locale();
Translatable::set_default_locale("en_US");
// Delete any default records created outside of fixtures
SiteConfig::get()->exclude('ID', $this->allFixtureIDs('SiteConfig'))->removeAll();
}
function tearDown() {