diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-06 16:14:44 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-06 16:14:44 -0800 |
| commit | b0a73757d220ca7a60109c50937a5851e5e44227 (patch) | |
| tree | 0ac99d2608bf723d41c1a80f488af6f2f78a36c3 /modules/g2_import/controllers/admin_g2_import.php | |
| parent | 0f9d23d074c81eafab05ce5d64909da624a86422 (diff) | |
| parent | 33b39efb491d730c8653ca3c06a22297338aa8b8 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/g2_import/controllers/admin_g2_import.php')
| -rw-r--r-- | modules/g2_import/controllers/admin_g2_import.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php index 6dd155b9..f216091a 100644 --- a/modules/g2_import/controllers/admin_g2_import.php +++ b/modules/g2_import/controllers/admin_g2_import.php @@ -32,13 +32,14 @@ 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->version = g2_import::version(); + $view->content->version = ''; if (g2_import::is_initialized()) { $view->content->g2_stats = $g2_stats; $view->content->g2_sizes = $g2_sizes; $view->content->thumb_size = module::get_var("gallery", "thumb_size"); $view->content->resize_size = module::get_var("gallery", "resize_size"); + $view->content->version = g2_import::version(); } g2_import::restore_error_reporting(); print $view; |
