Merge tag '3.3.4' into 3.3

Release 3.3.4
This commit is contained in:
Daniel Hensby 2016-11-29 17:14:37 +00:00
commit cbbfc50675
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -497,6 +497,8 @@ class UploadFieldTest extends FunctionalTest {
} }
public function testEdit() { public function testEdit() {
//for some reason the date_format is being set to null
Config::inst()->update('i18n', 'date_format', 'yyyy-MM-dd');
$memberID = $this->loginWithPermission('ADMIN'); $memberID = $this->loginWithPermission('ADMIN');
$record = $this->objFromFixture('UploadFieldTest_Record', 'record1'); $record = $this->objFromFixture('UploadFieldTest_Record', 'record1');