|
|
@@ -14,12 +14,7 @@
|
|
|
}
|
|
|
mysqli_set_charset($conn,'utf8');
|
|
|
|
|
|
- $sql = "SELECT questions.id, question, answer, categoryId as category, name, r,g,b,a FROM questions
|
|
|
- INNER JOIN questionToCategory ON questions.id = questionToCategory.questionId
|
|
|
- INNER JOIN category on category.id = questionToCategory.categoryId
|
|
|
- WHERE questionToCategory.categoryId IN (SELECT categoryId FROM gameCategories WHERE gameId = $gameId) AND
|
|
|
- questions.id NOT IN ($answeredQuestions)
|
|
|
- ORDER BY RAND() limit 1";
|
|
|
+ $sql = "SELECT questions.id, question, answer, categoryId as category, name, r,g,b,a FROM questions INNER JOIN questionToCategory ON questions.id = questionToCategory.questionId INNER JOIN category on category.id = questionToCategory.categoryId WHERE questionToCategory.categoryId IN (SELECT categoryId FROM gameCategories WHERE gameId = $gameId) " . ($answeredQuestions == ""?:" AND questions.id NOT IN ($answeredQuestions)") . " ORDER BY RAND() limit 1";
|
|
|
|
|
|
$result = mysqli_query($conn, $sql);
|
|
|
|