Manually resolved conflict after recent pull.

1 files changed, 6 insertions, 1 deletions

diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 6c960893..98eb57f1 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -34,6 +34,11 @@ class G2_Controller extends Controller {
     $path = $input->get("path");
     $id = $input->get("g2_itemId");
 
+    /* Tags are handled specially, since there's no mapping for them */
+    if (($path && 0 === strpos($path, "tag/"))) {
+      url::redirect("tag_name/" . substr($path, 4));
+    }
+
     if (($path && $path != 'index.php' && $path != 'main.php') || $id) {
       if ($id) {
         // Requests by id are either core.DownloadItem or core.ShowItem requests. Later versions of
@@ -94,4 +99,4 @@ class G2_Controller extends Controller {
       throw new Kohana_404_Exception();
     }
   }
-}
\ No newline at end of file
+}