diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-09-07 21:04:38 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-09-07 21:04:38 -0700 |
| commit | ab880120e69b27bdcfed07d3b0729108326b335d (patch) | |
| tree | 23af2f21ba41e737916206dcbc7175c528438810 | |
| parent | 2f94dfc67c809ae356e5d3e1a5ab21c7ba0a2a27 (diff) | |
The G2 import sets the sort_order to "asc"/"desc" but
Item_Model::get_position() expects "DESC". This breaks navigation in
any album imported from G2 that has a descending sort order.
Two things:
1) Use "ASC"/"DESC" in G2 import for consistency
2) Make Item_Model::get_position() more robust against capitalization
Fixes ticket #1334.
| -rw-r--r-- | modules/g2_import/helpers/g2_import.php | 6 | ||||
| -rw-r--r-- | modules/gallery/models/item.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index c3737f8f..515eb73d 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -452,9 +452,9 @@ class g2_import_Core { "title" => "title", "viewCount" => "view_count"); $direction_map = array( - 1 => "asc", - ORDER_ASCENDING => "asc", - ORDER_DESCENDING => "desc"); + 1 => "ASC", + ORDER_ASCENDING => "ASC", + ORDER_DESCENDING => "DESC"); // Only consider G2's first sort order $g2_order = explode("|", $g2_album->getOrderBy() . ""); $g2_order = $g2_order[0]; diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index 34c22021..485cd8cf 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -530,7 +530,7 @@ class Item_Model extends ORM_MPTT { * the first child in the album is at position 1. */ public function get_position($child, $where=array()) { - if ($this->sort_order == "DESC") { + if (!strcasecmp($this->sort_order, "DESC")) { $comp = ">"; } else { $comp = "<"; |