DataObjects/Mtrack_change.php
authorAlan Knowles <alan@roojs.com>
Wed, 14 Nov 2018 04:54:48 +0000 (12:54 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 14 Nov 2018 04:54:48 +0000 (12:54 +0800)
DataObjects/Mtrack_change.php

index c79c7d7..58b7295 100644 (file)
@@ -666,7 +666,18 @@ class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
         ");
         $hours = $ie->fetchAll(false,false,'toArray');
         
-        return array_merge($data , $hours);
+        $ret =  array_merge($data , $hours);
+        
+        usort($ret, function($a,$b) {
+            $aa = $a['changedate'];
+            $bb == $b['changedate'];
+            if ($aa == $bb) {
+                return 0;
+            }
+            return strtotime($aa) > strtotime($bb) ? -1 : 1;
+        }
+        
+        return $ret;