Merge pull request #7312 from Sesquipedalian/qanda_cast_array

Ensures Q&A answers are always an array
SimpleMachines · Feb 20, 2022 · f9d00d0 · f9d00d0
2 parents 788363e + fc4e7ce
commit f9d00d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Sources/ManageSettings.php b/Sources/ManageSettings.php
@@ -785,7 +785,7 @@ function ModifyAntispamSettings($return_config = false)
 		$context['question_answers'][$row['id_question']] = array(
 			'lngfile' => $lang,
 			'question' => $row['question'],
-			'answers' => $smcFunc['json_decode']($row['answers'], true),
+			'answers' => (array) $smcFunc['json_decode']($row['answers'], true),
 		);
 		$context['qa_by_lang'][$lang][] = $row['id_question'];
 	}

diff --git a/Sources/Subs-Editor.php b/Sources/Subs-Editor.php
@@ -2069,7 +2069,7 @@ function create_control_verification(&$verificationOptions, $do_test = false)
 				$id_question = $row['id_question'];
 				unset ($row['id_question']);
 				// Make them all lowercase. We can't directly use $smcFunc['strtolower'] with array_walk, so do it manually, eh?
-				$row['answers'] = $smcFunc['json_decode']($row['answers'], true);
+				$row['answers'] = (array) $smcFunc['json_decode']($row['answers'], true);
 				foreach ($row['answers'] as $k => $v)
 					$row['answers'][$k] = $smcFunc['strtolower']($v);