|
@ -302,12 +302,12 @@ function game_millionaire_SelectQuestion( &$aAnswer, $game, $attempt, &$milliona |
|
|
if( game_get_moodle_version() < '02.07') |
|
|
if( game_get_moodle_version() < '02.07') |
|
|
{ |
|
|
{ |
|
|
$select = "qtype='multichoice' AND quiz='$game->quizid' ". |
|
|
$select = "qtype='multichoice' AND quiz='$game->quizid' ". |
|
|
" AND qqi.question=q.id"; |
|
|
" AND qqi.question=q.id AND q.category=1"; |
|
|
$table = "{question} q,{quiz_question_instances} qqi"; |
|
|
$table = "{question} q,{quiz_question_instances} qqi"; |
|
|
}else |
|
|
}else |
|
|
{ |
|
|
{ |
|
|
$select = "qtype='multichoice' AND qs.quizid='$game->quizid' ". |
|
|
$select = "qtype='multichoice' AND qs.quizid='$game->quizid' ". |
|
|
" AND qs.questionid=q.id"; |
|
|
" AND qs.questionid=q.id AND q.category=1"; |
|
|
$table = "{question} q,{quiz_slots} qs"; |
|
|
$table = "{question} q,{quiz_slots} qs"; |
|
|
} |
|
|
} |
|
|
}else |
|
|
}else |
|
@ -324,7 +324,7 @@ function game_millionaire_SelectQuestion( &$aAnswer, $game, $attempt, &$milliona |
|
|
$select = 'q.category in ('.implode(',', $cats).')'; |
|
|
$select = 'q.category in ('.implode(',', $cats).')'; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
$select .= " AND qtype='multichoice'"; |
|
|
$select .= " AND qtype='multichoice' AND category=1"; |
|
|
|
|
|
|
|
|
$table = '{question} q'; |
|
|
$table = '{question} q'; |
|
|
} |
|
|
} |
|
|