Skip to content

✨ Filter v4 questions if learning mode is legacy #2612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shewa12 merged 3 commits into from
May 5, 2026
+50 −31
Merged

✨ Filter v4 questions if learning mode is legacy #2612

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dc4251
feat: Filter v4 questions if learning mode is legacy
b-l-i-n-d Apr 24, 2026
0a13382
refactor: replace hardcoded quiz question exclusion with a filterable…
b-l-i-n-d May 3, 2026
ca30d83
refactor: Refactor `get_questions_by_quiz` method
b-l-i-n-d May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 50 additions & 31 deletions classes/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5214,17 +5214,29 @@ public function get_quiz_option( $post_id = 0, $option_key = '', $default = fals
*/
public function get_questions_by_quiz( $quiz_id = 0 ) {
$quiz_id = $this->get_post_id( $quiz_id );
global $wpdb;

$questions = $wpdb->get_results(
$wpdb->prepare(
"SELECT *
FROM {$wpdb->prefix}tutor_quiz_questions
WHERE quiz_id = %d
ORDER BY question_order ASC
",
$quiz_id
)
$where = array(
'quiz_id' => $quiz_id,
);

/**
* Filter to exclude quiz question types
*
* @since 4.0.0
*/
$exclude_types = apply_filters( 'tutor_filter_unsupported_quiz_question_types', array() );

if ( tutor_utils()->count( $exclude_types ) ) {
$exclude_types = array_unique( $exclude_types );
$where['question_type'] = array( 'NOT IN', $exclude_types );
}

$questions = QueryHelper::get_all(
'tutor_quiz_questions',
$where,
'question_order',
-1,
'ASC'
);

$questions = apply_filters( 'tutor_get_questions_by_quiz', $questions, $quiz_id );
Expand Down Expand Up @@ -5583,32 +5595,39 @@ public function get_random_questions_by_quiz( $quiz_id = 0 ) {

$questions_order = $this->get_quiz_option( get_the_ID(), 'questions_order', 'rand' );

$order_by = '';
if ( 'rand' === $questions_order ) {
$order_by = 'ORDER BY RAND()';
} elseif ( 'asc' === $questions_order ) {
$order_by = 'ORDER BY question_id ASC';
$order_by = 'RAND()';
$order = '';

if ( 'asc' === $questions_order ) {
$order_by = 'question_id';
$order = 'ASC';
} elseif ( 'desc' === $questions_order ) {
$order_by = 'ORDER BY question_id DESC';
$order_by = 'question_id';
$order = 'DESC';
} elseif ( 'sorting' === $questions_order ) {
$order_by = 'ORDER BY question_order ASC';
$order_by = 'question_order';
$order = 'ASC';
}

$limit = '';
if ( $total_questions ) {
$limit = "LIMIT {$total_questions} ";
$where = array(
'quiz_id' => $quiz_id,
);

$exclude_types = apply_filters( 'tutor_filter_unsupported_quiz_question_types', array() );

if ( tutor_utils()->count( $exclude_types ) ) {
$exclude_types = array_unique( $exclude_types );
$where['question_type'] = array( 'NOT IN', $exclude_types );
}

$questions = $wpdb->get_results(
$wpdb->prepare(
"SELECT *
FROM {$wpdb->prefix}tutor_quiz_questions
WHERE quiz_id = %d
{$order_by}
{$limit}
",
$quiz_id
)
$limit = $total_questions ? $total_questions : -1;

$questions = QueryHelper::get_all(
'tutor_quiz_questions',
$where,
$order_by,
$limit,
$order
);

return $questions;
Expand Down Expand Up @@ -6464,7 +6483,7 @@ public function get_earning_statements( $user_id = 0, $filter_data = array() ) {
* @since 1.1.2
* @since 4.0.0 Condition added for different monetizations.
*
* @param int $price price.
* @param int $price price.
*
* @return int|string
*/
Expand Down
Loading