summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-09 20:18:24 +0000
committerBharat Mediratta <bharat@menalto.com>2009-05-09 20:18:24 +0000
commit6b00aa70e069a154fb8218cbdee7d222d89fcd91 (patch)
tree910f62bb4c35a462dea6be3a8f865bbd174b9c25 /modules
parent1bfbae15f6a0f186d385c4ad073555de12c46e04 (diff)
Don't try to put g2_stats and g2_size into the view if g2 is not initialized.
Diffstat (limited to 'modules')
-rw-r--r--modules/g2_import/controllers/admin_g2_import.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index 5ef97b5a..501051f1 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -28,10 +28,13 @@ class Admin_g2_import_Controller extends Admin_Controller {
$view = new Admin_View("admin.html");
$view->content = new View("admin_g2_import.html");
$view->content->form = $this->_get_import_form();
- $view->content->g2_stats = $g2_stats;
- $view->content->g2_sizes = $g2_sizes;
- $view->content->thumb_size = module::get_var("core", "thumb_size");
- $view->content->resize_size = module::get_var("core", "resize_size");
+
+ if (g2_import::is_initialized()) {
+ $view->content->g2_stats = $g2_stats;
+ $view->content->g2_sizes = $g2_sizes;
+ $view->content->thumb_size = module::get_var("core", "thumb_size");
+ $view->content->resize_size = module::get_var("core", "resize_size");
+ }
print $view;
}