1 files changed, 7 insertions, 0 deletions
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index c71997b4..161f0709 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -75,6 +75,13 @@ class g2_import_task_Core {
         $mode++;
         $task->set("last_id", 0);
         $queue = array();
+
+        // Start the loop from the beginning again.  This way if we get to a mode that requires no
+        // actions (eg, if the G2 comments module isn't installed) we won't try to do any comments
+        // queries.. in the next iteration we'll just skip over that mode.
+        if ($modes[$mode] != "done") {
+          continue;
+        }
       }
 
       switch($modes[$mode]) {