Merge tag '3.4.2' into 3.4

Release 3.4.2
This commit is contained in:
Daniel Hensby 2016-11-29 17:17:00 +00:00
commit 2e538ca9ab
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() {
//for some reason the date_format is being set to null
Config::inst()->update('i18n', 'date_format', 'yyyy-MM-dd');
$memberID = $this->loginWithPermission('ADMIN');
$record = $this->objFromFixture('UploadFieldTest_Record', 'record1');