Fix Item_Model::get_position() so that our sort is stable when the comparison

row has a null value in the sort field.  Fix for #627

Note: this changes get_position() to take an Item_Model instead of an id!

2 files changed, 10 insertions, 7 deletions

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 183c26d0..3ea08538 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -39,12 +39,15 @@ class Albums_Controller extends Items_Controller {
     $show = $this->input->get("show");
 
     if ($show) {
-      $index = $album->get_position($show);
-      $page = ceil($index / $page_size);
-      if ($page == 1) {
-        url::redirect($album->abs_url());
-      } else {
-        url::redirect($album->abs_url("page=$page"));
+      $child = ORM::factory("item", $show);
+      $index = $album->get_position($child);
+      if ($index) {
+        $page = ceil($index / $page_size);
+        if ($page == 1) {
+          url::redirect($album->abs_url());
+        } else {
+          url::redirect($album->abs_url("page=$page"));
+        }
       }
     }
 
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 79ad674a..e6154535 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -25,7 +25,7 @@ class Photos_Controller extends Items_Controller {
   public function _show($photo) {
     access::required("view", $photo);
 
-    $position = $photo->parent()->get_position($photo->id);
+    $position = $photo->parent()->get_position($photo);
     if ($position > 1) {
       list ($previous_item, $ignore, $next_item) =
         $photo->parent()->children(3, $position - 2);