Browse Source

Fix setting show_glossary_in_extra_tools see BT#9420

Julio Montoya 10 years ago
parent
commit
d74d70055f
1 changed files with 8 additions and 2 deletions
  1. 8 2
      main/exercice/exercise_submit.php

+ 8 - 2
main/exercice/exercise_submit.php

@@ -48,9 +48,16 @@ if ($debug) {
 // Notice for unauthorized people.
 api_protect_course_script(true);
 
+$origin = isset($_REQUEST['origin']) ? Security::remove_XSS($_REQUEST['origin']) : '';
+
 $is_allowedToEdit = api_is_allowed_to_edit(null,true);
 $glossaryExtraTools = api_get_setting('show_glossary_in_extra_tools');
-if (in_array($glossaryExtraTools, array('true', 'exercise', 'exercise_and_lp'))) {
+
+$showGlossary = in_array($glossaryExtraTools, array('true', 'exercise', 'exercise_and_lp'));
+if ($origin == 'learnpath') {
+    $showGlossary = in_array($glossaryExtraTools, array('true', 'lp', 'exercise_and_lp'));
+}
+if ($showGlossary) {
     $htmlHeadXtra[] = api_get_js('glossary.js');
     $htmlHeadXtra[] = api_get_js('jquery.highlight.js');
 }
@@ -68,7 +75,6 @@ $learnpath_id = isset($_REQUEST['learnpath_id']) ? intval($_REQUEST['learnpath_i
 $learnpath_item_id = isset($_REQUEST['learnpath_item_id']) ? intval($_REQUEST['learnpath_item_id']) : 0;
 $learnpath_item_view_id	= isset($_REQUEST['learnpath_item_view_id']) ? intval($_REQUEST['learnpath_item_view_id']) : 0;
 
-$origin = isset($_REQUEST['origin']) ? Security::remove_XSS($_REQUEST['origin']) : '';
 $reminder = isset($_REQUEST['reminder']) ? intval($_REQUEST['reminder']) : 0;
 $remind_question_id = isset($_REQUEST['remind_question_id']) ? intval($_REQUEST['remind_question_id']) : 0;
 $exerciseId = isset($_REQUEST['exerciseId']) ? intval($_REQUEST['exerciseId']) : 0;