Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 7 insertions, 2 deletions

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 515eb73d..8de5ce44 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -157,6 +157,7 @@ class g2_import_Core {
 
     $ret = GalleryEmbed::init();
     if ($ret) {
+      Kohana_Log::add("error", "Gallery 2 call failed with: " . $ret->getAsText());
       return false;
     }
 
@@ -1199,6 +1200,11 @@ class g2_import_Core {
     $g2_map->g3_id = $g3_id;
     $g2_map->g2_id = $g2_id;
     $g2_map->resource_type = $resource_type;
+
+    if (strpos($g2_url, self::$g2_base_url) === 0) {
+      $g2_url = substr($g2_url, strlen(self::$g2_base_url));
+    }
+
     $g2_map->g2_url = $g2_url;
     $g2_map->save();
     self::$map[$g2_id] = $g3_id;
@@ -1211,13 +1217,12 @@ class g2_import_Core {
 
   static function g2_url($params) {
     global $gallery;
-    $url = $gallery->getUrlGenerator()->generateUrl(
+    return $gallery->getUrlGenerator()->generateUrl(
       $params,
       array("forceSessionId" => false,
             "htmlEntities" => false,
             "urlEncode" => false,
             "useAuthToken" => false));
-    return str_replace(self::$g2_base_url, "", $url);
   }
 
   static function lower_error_reporting() {