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

Merge branch '3.4' into 3.5.0

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

2
model/Versioned.php
View File

@ -313,7 +313,7 @@ class Versioned extends DataExtension implements TemplateGlobalProvider {
// Ensure that any sort order referring to this ID is correctly aliased
$orders = $query->getOrderBy();
foreach($orders as $order => $dir) {
if($order === "\"$baseTable\".\"ID\"") {
if($order === "\"$baseTable\".\"ID\"" || trim($order, "'\"") === "ID") {
unset($orders[$order]);
$orders["\"{$baseTable}_versions\".\"RecordID\""] = $dir;
}

2
tests/forms/uploadfield/UploadFieldTest.php
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');