diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-27 15:49:20 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-27 15:49:20 -0700 |
| commit | a4c807232abaa4edd501ad5f4d7f06dac64f7ff8 (patch) | |
| tree | e93a8382e49ebee6a645c9b806cb5c735e02d1f8 | |
| parent | f21044ae1d4574daa992818afec85045598cd057 (diff) | |
| parent | ecc9203c2352bdfa3738998f27268293345ec0e9 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | modules/gallery/models/item.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index 038e11fb..dcbee991 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -399,10 +399,10 @@ class Item_Model extends ORM_MPTT { $db = Database::instance(); $position = $db->query(" SELECT COUNT(*) AS position FROM {items} - WHERE parent_id = {$this->id} + WHERE `parent_id` = {$this->id} AND `{$this->sort_column}` $comp (SELECT `{$this->sort_column}` - FROM {items} WHERE id = $child_id) - ORDER BY `{$this->sort_column}` {$this->sort_order}")->current()->position; + FROM {items} WHERE `id` = $child_id)") + ->current()->position; // We stopped short of our target value in the sort (notice that we're using a < comparator // above) because it's possible that we have duplicate values in the sort column. An @@ -414,9 +414,10 @@ class Item_Model extends ORM_MPTT { // our base value. $result = $db->query(" SELECT id FROM {items} - WHERE parent_id = {$this->id} + WHERE `parent_id` = {$this->id} AND `{$this->sort_column}` = (SELECT `{$this->sort_column}` - FROM {items} WHERE id = $child_id)"); + FROM {items} WHERE `id` = $child_id) + ORDER BY `id` ASC"); foreach ($result as $row) { $position++; if ($row->id == $child_id) { |