|
|
|
@ -2923,7 +2923,7 @@ EOT; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$conditions = [ |
|
|
|
$conditions = [ |
|
|
|
'where' => [ |
|
|
|
'where' => [ |
|
|
|
$active_sql.' (session_id = 0 OR session_id = ? ) AND c_id = ? '.$needle_where.$time_conditions => [ |
|
|
|
$active_sql.' (session_id = 0 OR session_id IS NULL OR session_id = ? ) AND c_id = ? '.$needle_where.$time_conditions => [ |
|
|
|
$session_id, |
|
|
|
$session_id, |
|
|
|
$course_id, |
|
|
|
$course_id, |
|
|
|
$needle, |
|
|
|
$needle, |
|
|
|
@ -3012,7 +3012,7 @@ EOT; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// All exercises |
|
|
|
// All exercises |
|
|
|
$conditions = [ |
|
|
|
$conditions = [ |
|
|
|
'where' => ["$sql_active_exercises (session_id = 0 OR session_id = ? ) AND c_id=?" => $params], |
|
|
|
'where' => ["$sql_active_exercises (session_id = 0 OR session_id IS NULL OR session_id = ? ) AND c_id=?" => $params], |
|
|
|
'order' => 'title', |
|
|
|
'order' => 'title', |
|
|
|
]; |
|
|
|
]; |
|
|
|
} |
|
|
|
} |
|
|
|
|