Merge pull request #884 from Arantor/release-2.1

! Upgrading verification questions should really use db_insert which dea...

other/upgrade_2-1_mysql.sql

@@ -484,19 +484,18 @@ $get_questions = upgrade_query("
 	WHERE comment_type = 'ver_test'");
 
 	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
-	{
-		$questions[] = "($language, $row[question], serialize(array($row[answer])))";
-	}
+		$questions[] = array($language, $row['question'], serialize(array($row['answer'])));
 
 	$smcFunc['db_free_result']($get_questions);
 
 	if (!empty($questions))
 	{
-		upgrade_query("
-			INSERT INTO {$db_prefix}qanda
-				(lngfile, question, answers)
-			VALUES
-				" . implode(',', $questions));
+		$smcFunc['db_insert']('',
+			'{db_prefix}qanda',
+			array('lngfile' => 'string', 'question' => 'string', 'answers' => 'string'),
+			$questions,
+			array('id_question')
+		);
 
 		// Delete the questions from log_comments now
 		upgrade_query("

other/upgrade_2-1_postgresql.sql

@@ -548,22 +548,18 @@ CREATE TABLE {$db_prefix}qanda (
 		WHERE comment_type = 'ver_test'");
 
 	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
-	{
-		$questions[] = "($language, $row[question], serialize(array($row[answer])))";
-	}
+		$questions[] = array($language, $row['question'], serialize(array($row['answer'])));
 
 	$smcFunc['db_free_result']($get_questions);
 
 	if (!empty($questions))
 	{
-		foreach ($questions as $question)
-		{
-			upgrade_query("
-				INSERT INTO {$db_prefix}qanda
-					(lngfile, question, answers)
-				VALUES
-					" . $question);
-		}
+		$smcFunc['db_insert']('',
+			'{db_prefix}qanda',
+			array('lngfile' => 'string', 'question' => 'string', 'answers' => 'string'),
+			$questions,
+			array('id_question')
+		);
 
 		// Delete the questions from log_comments now
 		upgrade_query("

other/upgrade_2-1_sqlite.sql

@@ -538,22 +538,18 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}qanda (
 		WHERE comment_type = 'ver_test'");
 
 	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
-	{
-		$questions[] = "($language, $row[question], serialize(array($row[answer])))";
-	}
+		$questions[] = array($language, $row['question'], serialize(array($row['answer'])));
 
 	$smcFunc['db_free_result']($get_questions);
 
 	if (!empty($questions))
 	{
-		foreach ($questions as $question)
-		{
-			upgrade_query("
-				INSERT INTO {$db_prefix}qanda
-					(lngfile, question, answers)
-				VALUES
-					" . $question);
-		}
+		$smcFunc['db_insert']('',
+			'{db_prefix}qanda',
+			array('lngfile' => 'string', 'question' => 'string', 'answers' => 'string'),
+			$questions,
+			array('id_question')
+		);
 
 		// Delete the questions from log_comments now
 		upgrade_query("