Gracefully handle the case when the gallery2 instances moves somewhere

else (or gets deleted).

Fixes ticket #458

2 files changed, 9 insertions, 2 deletions

diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index f2969f49..18d09363 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -21,6 +21,9 @@ class Admin_g2_import_Controller extends Admin_Controller {
   public function index() {
     if (g2_import::is_configured()) {
       g2_import::init();
+    }
+
+    if (class_exists("GalleryCoreApi")) {
       $g2_stats = g2_import::stats();
       $g2_sizes = g2_import::common_sizes();
     }
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) {