From 2a190660baeff8cd708926cea79f94f1630418b7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 23 Jun 2009 17:09:37 -0700
Subject: Gracefully handle the case when the gallery2 instances moves
 somewhere else (or gets deleted).

Fixes ticket #458
---
 modules/g2_import/helpers/g2_import_task.php | 8 ++++++--
 1 file changed, 6 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 4cd95581..3961097d 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -21,15 +21,19 @@ class g2_import_task_Core {
   static function available_tasks() {
     if (g2_import::is_configured()) {
       g2_import::init();
+    }
+
+
+    if (class_exists("GalleryCoreApi")) {
       return array(Task_Definition::factory()
                    ->callback("g2_import_task::import")
                    ->name(t("Import from Gallery 2"))
                    ->description(
                      t("Gallery %version detected", array("version" => g2_import::version())))
                    ->severity(log::SUCCESS));
-    } else {
-      return array();
     }
+
+    return array();
   }
 
   static function import($task) {
-- 
cgit v1.2.3


From 53284ec5b892915c5905ea4f1e3fe76b18d3b576 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 23 Jun 2009 18:39:00 -0700
Subject: Add support for Gallery 2.2.2 style bootstrap syntax.

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

(limited to 'modules/g2_import/helpers')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 2eee564a..91ca1e63 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -113,11 +113,13 @@ class g2_import_Core {
                 "require_once(dirname(__FILE__) . '/modules/core/classes/GalleryDataCache.class');",
                 "define('GALLERY_CONFIG_DIR', dirname(__FILE__));",
                 "\$gallery =& new Gallery();",
+                "\$GLOBALS['gallery'] =& new Gallery();",
                 "\$gallery = new Gallery();"),
           array("require_once(dirname(__FILE__) . '/Gallery.class');",
                 "require_once('$base_dir/modules/core/classes/GalleryDataCache.class');",
                 "define('GALLERY_CONFIG_DIR', '$config_dir');",
                 "\$gallery =& new G2_Gallery();",
+                "\$GLOBALS['gallery'] =& new G2_Gallery();",
                 "\$gallery = new G2_Gallery();"),
           array_merge(array("<?php defined(\"SYSPATH\") or die(\"No direct script access.\") ?>\n"),
                       file("$base_dir/bootstrap.inc"))));
-- 
cgit v1.2.3