From 9d4ac960a77a66263ddf072b4451556705f6c30b Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 22 Sep 2017 13:55:14 +0100 Subject: [PATCH 1/2] Use Datetime::now() for last edited updates in OrderableRows --- code/GridFieldOrderableRows.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/GridFieldOrderableRows.php b/code/GridFieldOrderableRows.php index 5b5c670..0479f34 100755 --- a/code/GridFieldOrderableRows.php +++ b/code/GridFieldOrderableRows.php @@ -470,12 +470,13 @@ class GridFieldOrderableRows extends RequestHandler implements $sortTable = $this->getSortTable($list); $additionalSQL = ''; $baseTable = $sortTable; + $now = SS_Datetime::now()->Rfc2822(); if(class_exists($sortTable)) { $baseTable = singleton($sortTable)->baseTable(); } $isBaseTable = ($baseTable == $sortTable); if(!$list instanceof ManyManyList && $isBaseTable){ - $additionalSQL = ', "LastEdited" = NOW()'; + $additionalSQL = ", \"LastEdited\" = '$now'"; } foreach($sortedIDs as $sortValue => $id) { @@ -491,7 +492,7 @@ class GridFieldOrderableRows extends RequestHandler implements if(!$isBaseTable) { DB::query(sprintf( - 'UPDATE "%s" SET "LastEdited" = NOW() WHERE %s', + "UPDATE \"%s\" SET \"LastEdited\" = '$now' WHERE %s", $baseTable, $this->getSortTableClauseForIds($list, $id) )); @@ -520,6 +521,7 @@ class GridFieldOrderableRows extends RequestHandler implements $field = $this->getSortField(); $table = $this->getSortTable($list); $clause = sprintf('"%s"."%s" = 0', $table, $this->getSortField()); + $now = SS_Datetime::now()->Rfc2822(); $additionalSQL = ''; $baseTable = $table; @@ -528,7 +530,7 @@ class GridFieldOrderableRows extends RequestHandler implements } $isBaseTable = ($baseTable == $table); if(!$list instanceof ManyManyList && $isBaseTable){ - $additionalSQL = ', "LastEdited" = NOW()'; + $additionalSQL = ", \"LastEdited\" = '$now'"; } foreach($list->where($clause)->column('ID') as $id) { @@ -546,7 +548,7 @@ class GridFieldOrderableRows extends RequestHandler implements if(!$isBaseTable) { DB::query(sprintf( - 'UPDATE "%s" SET "LastEdited" = NOW() WHERE %s', + "UPDATE \"%s\" SET \"LastEdited\" = '$now' WHERE %s", $baseTable, $this->getSortTableClauseForIds($list, $id) )); From fdbac6030007ff89bc8a563a61250d709e6e0608 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 8 Nov 2017 15:22:13 +1300 Subject: [PATCH 2/2] Remove PHP 5.3 from Travis builds --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8425684..8789d4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ sudo: false language: php php: - - 5.3 - 5.4 - 5.5 - 5.6