diff options
author | Chad Kieffer <ckieffer@gmail.com> | 2009-06-23 23:56:05 -0600 |
---|---|---|
committer | Chad Kieffer <ckieffer@gmail.com> | 2009-06-23 23:56:05 -0600 |
commit | c37fc39152ceeb5f4d51f9b297b313847bb445e5 (patch) | |
tree | b27850ad7eff09217f4a9a34379ff3780cd1a19e /modules/g2_import/helpers/g2_import_task.php | |
parent | 200e17c884df8c2a265fab828be2ef869e580e35 (diff) | |
parent | f9dbd4eb2feede5381d481f473bf7f0a77b49e4a (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/g2_import/helpers/g2_import_task.php')
-rw-r--r-- | modules/g2_import/helpers/g2_import_task.php | 8 |
1 files changed, 6 insertions, 2 deletions
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) { |