Merge remote-tracking branch 'origin/master'

2 years ago · 95e81e3e99
parent d0b843daf3 4b3edd8acd
commit 95e81e3e99
17 changed files with 1 additions and 1 deletions
--- a/public/img/icons/64/calculated_answer_na.png
+++ b/public/img/icons/64/calculated_answer_na.png
--- a/public/img/icons/64/fill_in_blanks_na.png
+++ b/public/img/icons/64/fill_in_blanks_na.png
--- a/public/img/icons/64/hotspot_na.png
+++ b/public/img/icons/64/hotspot_na.png
--- a/public/img/icons/64/matching_na.png
+++ b/public/img/icons/64/matching_na.png
--- a/public/img/icons/64/matchingdrag_na.png
+++ b/public/img/icons/64/matchingdrag_na.png
--- a/public/img/icons/64/mccert_na.png
+++ b/public/img/icons/64/mccert_na.png
--- a/public/img/icons/64/mcma_na.png
+++ b/public/img/icons/64/mcma_na.png
--- a/public/img/icons/64/mcmac_na.png
+++ b/public/img/icons/64/mcmac_na.png
--- a/public/img/icons/64/mcmaco_na.png
+++ b/public/img/icons/64/mcmaco_na.png
--- a/public/img/icons/64/mcmagl_na.png
+++ b/public/img/icons/64/mcmagl_na.png
--- a/public/img/icons/64/mcmao_na.png
+++ b/public/img/icons/64/mcmao_na.png
--- a/public/img/icons/64/mcua_na.png
+++ b/public/img/icons/64/mcua_na.png
--- a/public/img/icons/64/mcuao_na.png
+++ b/public/img/icons/64/mcuao_na.png
--- a/public/img/icons/64/open_answer_na.png
+++ b/public/img/icons/64/open_answer_na.png
--- a/public/img/icons/64/ordering_na.png
+++ b/public/img/icons/64/ordering_na.png
--- a/public/img/icons/64/uaimg_na.png
+++ b/public/img/icons/64/uaimg_na.png
--- a/public/main/exercise/question_pool.php
+++ b/public/main/exercise/question_pool.php
@ -385,7 +385,7 @@ $categoryList = TestCategory::getCategoriesIdAndName($selected_course);
 // Get exercise list for this course
 $exercise_list = ExerciseLib::get_all_exercises_for_course_id(
    $selected_course,
-    $session_id,
+    (empty($session_id) ? 0 : $session_id),
    false
 );