summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-02 21:52:46 +0000
committerBharat Mediratta <bharat@menalto.com>2009-05-02 21:52:46 +0000
commite70be4c0c2d150c20a73b1e53ce5408575574ec2 (patch)
treef460b8e94a7bab7f06b9f923e51a9a731c9b6ed7 /modules
parent2c61ad361ec00dd3f329eb54e238d80c79a3e8f5 (diff)
Cache the entry in our in-memory map when we map a g2 item to a g3
item in the database. This fixes the problem that the import fails the first time around because the various groups are mapped in the db but aren't available in the request.
Diffstat (limited to 'modules')
-rw-r--r--modules/g2_import/helpers/g2_import.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 7e8bc598..bc6061ea 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -136,7 +136,7 @@ class g2_import_Core {
}
$g2_admin_group_id =
- g2(GalleryCoreApi::getPluginParameter("module", "core", "id.adminGroup"));;
+ g2(GalleryCoreApi::getPluginParameter("module", "core", "id.adminGroup"));
$g2_user = g2(GalleryCoreApi::loadEntitiesById($g2_user_id));
$g2_groups = g2(GalleryCoreApi::fetchGroupsForUser($g2_user->getId()));
@@ -312,5 +312,6 @@ class g2_import_Core {
$g2_map->g3_id = $g3_id;
$g2_map->g2_id = $g2_id;
$g2_map->save();
+ self::$map[$g2_id] = $g3_id;
}
}