Merge branch 'master' into bharat_dev

1 files changed, 7 insertions, 1 deletions

diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index 6bda8f17..31615a55 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -56,7 +56,7 @@ class g2_import_task_Core {
     $mode = $task->get("mode");
     $queue = $task->get("queue");
     if (!isset($mode)) {
-      $stats = g2_import::stats();
+      $stats = g2_import::g2_stats();
       $stats["items"] = $stats["photos"] + $stats["movies"];
       unset($stats["photos"]);
       unset($stats["movies"]);
@@ -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) {