Fix show glossary in LP see BT#13415

main/document/showinframes.php

@@ -185,7 +185,7 @@ $js_glossary_in_documents = '
         { type:"stylesheet", id:"_fr5", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/jquery-ui.min.css"},
         { type:"stylesheet", id:"_fr6", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/theme.css"},
         { type:"script", id:"_fr2", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js"},
-        { type:"script", id:"_fr3", src:"'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php"}
+        { type:"script", id:"_fr3", src:"'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php?'.api_get_cidreq().'"}
     ]
   });';
 

main/exercise/exercise_submit.php

@@ -45,7 +45,7 @@ if ($origin == 'learnpath') {
     $showGlossary = in_array($glossaryExtraTools, array('true', 'lp', 'exercise_and_lp'));
 }
 if ($showGlossary) {
-    $htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php?add_ready=1"></script>';
+    $htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php?add_ready=1&'.api_get_cidreq().'"></script>';
     $htmlHeadXtra[] = api_get_js('jquery.highlight.js');
 }
 

main/glossary/glossary.js.php

@@ -3,15 +3,27 @@
 
 require_once __DIR__.'/../inc/global.inc.php';
 
+$origin = api_get_origin();
+
 $tpl = new Template();
 
-$templateName = 'glossary/glossary_auto.js.tpl';
-if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
-    $templateName = 'glossary/glossary_manual.js.tpl';
+$glossaryExtraTools = api_get_setting('show_glossary_in_extra_tools');
+
+if ($origin == 'learnpath') {
+    $showGlossary = in_array($glossaryExtraTools, array('lp', 'exercise_and_lp'));
+} else {
+    $showGlossary = in_array($glossaryExtraTools, array('true', 'lp', 'exercise_and_lp'));
 }
 
-$addReady = isset($_GET['add_ready']) ? true : false;
-$tpl->assign('add_ready', $addReady);
-$contentTemplate = $tpl->get_template($templateName);
-header('Content-type: application/x-javascript');
-$tpl->display($contentTemplate);
+if ($showGlossary) {
+    $templateName = 'glossary/glossary_auto.js.tpl';
+    if (api_get_setting('show_glossary_in_documents') == 'ismanual') {
+        $templateName = 'glossary/glossary_manual.js.tpl';
+    }
+
+    $addReady = isset($_GET['add_ready']) ? true : false;
+    $tpl->assign('add_ready', $addReady);
+    $contentTemplate = $tpl->get_template($templateName);
+    header('Content-type: application/x-javascript');
+    $tpl->display($contentTemplate);
+}