5 files changed, 12 insertions, 5 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;
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 5fd4400c..8260cf9f 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class G2_Controller extends Admin_Controller {
+class G2_Controller extends Controller {
   /**
    * Redirect Gallery 2 urls to their appropriate matching Gallery 3 url.
    *
@@ -64,6 +64,7 @@ class G2_Controller extends Admin_Controller {
     case "resize":
       url::redirect($item->resize_url(true));
 
+    case "file":
     case "full":
       url::redirect($item->file_url(true));
 
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 0fcc0539..f13c63b1 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -541,6 +541,10 @@ class g2_import_Core {
       $item->save();
 
       self::set_map($g2_item_id, $item->id, "item", $g2_item_url);
+
+      self::set_map($g2_item_id, $item->id, "file",
+                    self::g2_url(array("view" => "core.DownloadItem", "itemId" => $g2_item_id)));
+
       $derivatives = g2(GalleryCoreApi::fetchDerivativesByItemIds(array($g2_item_id)));
       if (!empty($derivatives[$g2_item_id])) {
         foreach ($derivatives[$g2_item_id] as $derivative) {
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index e0212b33..2e81adef 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -19,14 +19,15 @@
  */
 class g2_import_task_Core {
   static function available_tasks() {
+    $version = '';
     g2_import::lower_error_reporting();
     if (g2_import::is_configured()) {
       g2_import::init();
+      $version = g2_import::version();
     }
-    $version = g2_import::version();
     g2_import::restore_error_reporting();
 
-    if (class_exists("GalleryCoreApi")) {
+    if (g2_import::is_initialized()) {
       return array(Task_Definition::factory()
                    ->callback("g2_import_task::import")
                    ->name(t("Import from Gallery 2"))
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 6a5214a3..41ef7f85 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -103,7 +103,7 @@
         &lt;IfModule mod_rewrite.c&gt;<br/>
           RewriteEngine On<br/>
           RewriteBase <?= html::clean(g2_import::$g2_base_url) ?><br/>
-          RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?>   [QSA,L]<br/>
+          RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?>   [QSA,L,R=301]<br/>
         &lt;/IfModule&gt;<br/>
       </code>
     </div>