summaryrefslogtreecommitdiff
path: root/modules/g2_import
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-09-07 21:04:38 -0700
committerBharat Mediratta <bharat@menalto.com>2010-09-07 21:04:38 -0700
commitab880120e69b27bdcfed07d3b0729108326b335d (patch)
tree23af2f21ba41e737916206dcbc7175c528438810 /modules/g2_import
parent2f94dfc67c809ae356e5d3e1a5ab21c7ba0a2a27 (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.
Diffstat (limited to 'modules/g2_import')
-rw-r--r--modules/g2_import/helpers/g2_import.php6
1 files changed, 3 insertions, 3 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];