[jan] Fix sorting by due date with PHP < 5.5 (Bug #14507).

Fixes regression introduced with fix for bug 14504.
horde · Nov 9, 2016 · 00ec780 · 00ec780
1 parent 4f39ede
commit 00ec780
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.2.13-git
 -----------
 
+[jan] Fix sorting by due date with PHP < 5.5 (Bug #14507).
 
 
 -------

diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php
@@ -1535,26 +1535,26 @@ static public function _rsortByEstimate($a, $b)
      */
     static public function _sortByDue($a, $b)
     {
-        $a_due = empty($a->getNextDue())
-            ? 0
-            : $a->getNextDue()->timestamp();
-        $b_due = empty($b->getNextDue())
-            ? 0
-            : $b->getNextDue()->timestamp();
-
-        if ($a_due == $b_due) {
+        $a_due = $a->getNextDue();
+        $b_due = $b->getNextDue();
+
+        if (!$a_due && !$b_due) {
             return self::_sortByName($a, $b);
         }
 
         // Treat empty due dates as farthest into the future.
-        if ($a_due == 0) {
+        if (!$a_due) {
             return 1;
         }
-        if ($b_due == 0) {
+        if (!$b_due) {
             return -1;
         }
 
-        return ($a_due > $b_due) ? 1 : -1;
+        if ($a_due->equals($b_due)) {
+            return self::_sortByName($a, $b);
+        }
+
+        return ($a_due->after($b_due)) ? 1 : -1;
     }
 
     /**

diff --git a/nag/package.xml b/nag/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [jan] Fix sorting by due date with PHP &lt; 5.5 (Bug #14507).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1766,7 +1766,7 @@
    <date>2016-11-08</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [jan] Fix sorting by due date with PHP &lt; 5.5 (Bug #14507).
    </notes>
   </release>
  </changelog>