diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-05-28 01:46:19 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-05-28 01:46:19 -0700 |
| commit | 8c3135ef723bf494756b44247342af6c8cf6648b (patch) | |
| tree | b7805b0d0bb136951211b8b77b150da937eec349 /modules | |
| parent | c1e55e9593a6b0ce9f749eb85c4bca1d649e358a (diff) | |
| parent | 6fdc84f5def3b2f51e62bf06e83d01da4593265e (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/g2_import/helpers/g2_import.php | 3 |
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 fdeb63f8..60dd593f 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -443,7 +443,8 @@ class g2_import_Core { // @todo we need a more persistent warning $g2_item_url = $url_generator->generateUrl(array("itemId" => $g2_item->getId())); // Why oh why did I ever approve the session id placeholder idea in G2? - $g2_item_url = str_replace('TMP_SESSION_ID_DI_NOISSES_PMT', '', $g2_item_url); + $g2_item_url = + str_replace('&g2_GALLERYSID=TMP_SESSION_ID_DI_NOISSES_PMT', '', $g2_item_url); $warning = t("<a href=\"%g2_url\">%title</a> from Gallery 2 could not be processed; " . "(imported as <a href=\"%g3_url\">%title</a>)", |