Fixing a sorting bug.

jamesmoss · Jan 28, 2014 · c1f8b8d · c1f8b8d
1 parent 27fd21a
commit c1f8b8d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/JamesMoss/Flywheel/Query.php b/src/JamesMoss/Flywheel/Query.php
@@ -145,15 +145,21 @@ protected function sort(array $array, array $args)
             $i   = 0;
             $cmp = 0;
             while ($cmp == 0 && $i < $c) {
-                $valueA = $a->{$args[$i][0]};
-                $valueB = $b->{$args[$i][0]};
+                $keyName = $args[$i][0];
+                if($keyName == 'id') {
+                    $valueA = $a->getId();
+                    $valueB = $b->getId();
+                } else {
+                    $valueA = isset($a->{$keyName}) ? $a->{$keyName} : null;
+                    $valueB = isset($b->{$keyName}) ? $b->{$keyName} : null; 
+                }
 
                 if (is_string($valueA)) {
                     $cmp = strcmp($valueA, $valueB);
                 } elseif (is_bool($valueA)) {
                     $cmp = $valueA - $valueB;
                 } else {
-                    $cmp = ($valueA == $valueB) ? 0 : ($valueA > $valueB) ? -1 : 1;
+                    $cmp = ($valueA == $valueB) ? 0 : (($valueA > $valueB) ? -1 : 1);
                 }
 
                 if ($args[$i][1] === SORT_DESC) {