From d8d1155615739a9e6f1f12d4f1ce2ec7cc9cd444 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 6 Feb 2010 14:20:19 -0800
Subject: Fix maintenance view, which was broken when the g2_import module was
 installed but not configured correctly.

---
 modules/g2_import/helpers/g2_import_task.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/g2_import/helpers')

diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index e0212b33..2e81adef 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -19,14 +19,15 @@
  */
 class g2_import_task_Core {
   static function available_tasks() {
+    $version = '';
     g2_import::lower_error_reporting();
     if (g2_import::is_configured()) {
       g2_import::init();
+      $version = g2_import::version();
     }
-    $version = g2_import::version();
     g2_import::restore_error_reporting();
 
-    if (class_exists("GalleryCoreApi")) {
+    if (g2_import::is_initialized()) {
       return array(Task_Definition::factory()
                    ->callback("g2_import_task::import")
                    ->name(t("Import from Gallery 2"))
-- 
cgit v1.2.3


From 33b39efb491d730c8653ca3c06a22297338aa8b8 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 6 Feb 2010 15:46:13 -0800
Subject: Add core.DownloadItem redirect for G2's Photo and Movie items (was
 previously omitted, but we already had core.DownloadItem redirects for
 derivatives)

---
 modules/g2_import/controllers/g2.php    | 1 +
 modules/g2_import/helpers/g2_import.php | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'modules/g2_import/helpers')

diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 70461600..8260cf9f 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -64,6 +64,7 @@ class G2_Controller extends Controller {
     case "resize":
       url::redirect($item->resize_url(true));
 
+    case "file":
     case "full":
       url::redirect($item->file_url(true));
 
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 0fcc0539..f13c63b1 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -541,6 +541,10 @@ class g2_import_Core {
       $item->save();
 
       self::set_map($g2_item_id, $item->id, "item", $g2_item_url);
+
+      self::set_map($g2_item_id, $item->id, "file",
+                    self::g2_url(array("view" => "core.DownloadItem", "itemId" => $g2_item_id)));
+
       $derivatives = g2(GalleryCoreApi::fetchDerivativesByItemIds(array($g2_item_id)));
       if (!empty($derivatives[$g2_item_id])) {
         foreach ($derivatives[$g2_item_id] as $derivative) {
-- 
cgit v1.2.3