diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2011-04-27 19:30:00 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2011-04-27 19:30:00 -0700 |
| commit | 4e20e71d0375ed65d75dbdb12113f737db90b3e7 (patch) | |
| tree | 51d15ed4ac3ee4f44886f94ed8c3197c76d050ac /modules/g2_import/helpers/g2_import_task.php | |
| parent | 7f48671186a4bf3a4745cd7a31b48a891dd83078 (diff) | |
| parent | 7577d02fe2f2c37a79caf6a32b246f5a046c917a (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/g2_import/helpers/g2_import_task.php')
| -rw-r--r-- | modules/g2_import/helpers/g2_import_task.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php index 5e908676..31615a55 100644 --- a/modules/g2_import/helpers/g2_import_task.php +++ b/modules/g2_import/helpers/g2_import_task.php @@ -127,6 +127,12 @@ class g2_import_task_Core { $g2_root_id = g2(GalleryCoreApi::getDefaultAlbumId()); $tree = g2(GalleryCoreApi::fetchAlbumTree()); $task->set("queue", $queue = array($g2_root_id => $tree)); + + // Update the root album to reflect the Gallery2 root album. + $root_album = item::root(); + g2_import::set_album_values( + $root_album, g2(GalleryCoreApi::loadEntitiesById($g2_root_id))); + $root_album->save(); } $log_message = g2_import::import_album($queue); if ($log_message) { |