diff options
| author | colings <colings@example.com> | 2011-01-09 11:43:45 -0600 |
|---|---|---|
| committer | colings <colings@example.com> | 2011-01-09 11:43:45 -0600 |
| commit | 02a349f68ac480d5b1a630e14b4f2e3558328673 (patch) | |
| tree | 25bf25960b6811d8dbcbed6f6c9d63de7c03bd4e /modules/g2_import/helpers/g2_import_task.php | |
| parent | c2a1ea64eda2bf3e22ecaf4df4714c091bc5d7c4 (diff) | |
| parent | de5b06ae7442db2c7a8999c0c806997248ddb151 (diff) | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'modules/g2_import/helpers/g2_import_task.php')
| -rw-r--r-- | modules/g2_import/helpers/g2_import_task.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php index f2a13291..a90b1fc3 100644 --- a/modules/g2_import/helpers/g2_import_task.php +++ b/modules/g2_import/helpers/g2_import_task.php @@ -96,7 +96,8 @@ class g2_import_task_Core { switch($modes[$mode]) { case "groups": if (empty($queue)) { - $task->set("queue", $queue = array_keys(g2(GalleryCoreApi::fetchGroupNames()))); + $task->set("queue", $queue = g2_import::get_group_ids($task->get("last_id", 0))); + $task->set("last_id", end($queue)); } $log_message = g2_import::import_group($queue); if ($log_message) { @@ -109,8 +110,8 @@ class g2_import_task_Core { case "users": if (empty($queue)) { - $task->set( - "queue", $queue = array_keys(g2(GalleryCoreApi::fetchUsersForGroup(GROUP_EVERYBODY)))); + $task->set("queue", $queue = g2_import::get_user_ids($task->get("last_id", 0))); + $task->set("last_id", end($queue)); } $log_message = g2_import::import_user($queue); if ($log_message) { @@ -141,7 +142,6 @@ class g2_import_task_Core { $task->set("queue", $queue = g2_import::get_item_ids($task->get("last_id", 0))); $task->set("last_id", end($queue)); } - $log_message = g2_import::import_item($queue); if ($log_message) { $task->log($log_message); |