Fixed issue #10044: Subquestions are shown as imported even when skip…

…ped due to malformed SQL
LimeSurvey · Dec 4, 2015 · 618588f · 618588f
1 parent 313548f
commit 618588f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -469,12 +469,15 @@ function XMLImportQuestion($sFullFilePath, $iNewSID, $newgid)
             foreach ($insertdata as $k => $v)
                 $ques->$k = $v;
             $result = $ques->save();
-            $newsqid=getLastInsertID($ques->tableName());
-            if (!isset($insertdata['qid']))
+            if ($result)
             {
-                $aQIDReplacements[$oldsqid]=$newsqid; // add old and new qid to the mapping array
+                $newsqid=getLastInsertID($ques->tableName());
+                if (!isset($insertdata['qid']))
+                {
+                    $aQIDReplacements[$oldsqid]=$newsqid; // add old and new qid to the mapping array
+                }
+                $results['subquestions']++;
             }
-            $results['subquestions']++;
         }
     }