Ignore the presort when transferring over sort orders. Fixes #1710.

1 files changed, 3 insertions, 2 deletions

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index e9c19c9d..50ab8a23 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -475,9 +475,10 @@ class g2_import_Core {
         1 => "ASC",
         ORDER_ASCENDING => "ASC",
         ORDER_DESCENDING => "DESC");
-      // Only consider G2's first sort order
+      // G2 sorts can either be <sort> or <presort>|<sort>.  Right now we can't
+      // map presorts so ignore them.
       $g2_order = explode("|", $g2_album->getOrderBy() . "");
-      $g2_order = $g2_order[0];
+      $g2_order = end($g2_order);
       if (empty($g2_order)) {
         $g2_order = g2(GalleryCoreApi::getPluginParameter('module', 'core', 'default.orderBy'));
       }