diff --git a/main/lp/learnpathItem.class.php b/main/lp/learnpathItem.class.php index 7c6ce99435..4a62b9d517 100755 --- a/main/lp/learnpathItem.class.php +++ b/main/lp/learnpathItem.class.php @@ -2175,10 +2175,9 @@ class learnpathItem break; } } + if (empty($this->prereq_alert) && !$andstatus) { - $this->prereq_alert = get_lang( - 'LearnpathPrereqNotCompleted' - ); + $this->prereq_alert = get_lang('LearnpathPrereqNotCompleted'); } return $andstatus; @@ -2728,9 +2727,7 @@ class learnpathItem } } if (!$orstatus && empty($this->prereq_alert)) { - $this->prereq_alert = get_lang( - 'LearnpathPrereqNotCompleted' - ); + $this->prereq_alert = get_lang('LearnpathPrereqNotCompleted'); } return $orstatus; diff --git a/main/lp/lp_content.php b/main/lp/lp_content.php index 737b03be61..bce2853019 100755 --- a/main/lp/lp_content.php +++ b/main/lp/lp_content.php @@ -62,7 +62,7 @@ if ($dir) { $src = $learnPath->fixBlockedLinks($src); break; } - $src = 'blank.php?error=prerequisites&prerequisite_message='.$learnPath->error; + $src = 'blank.php?error=prerequisites&prerequisite_message='.Security::remove_XSS($learnPath->error); break; case 2: $learnPath->stop_previous_item(); @@ -72,7 +72,7 @@ if ($dir) { $src = $learnPath->get_link('http', $lpItemId); $learnPath->start_current_item(); // starts time counter manually if asset } else { - $src = 'blank.php?error=prerequisites&prerequisite_message='.$learnPath->error; + $src = 'blank.php?error=prerequisites&prerequisite_message='.Security::remove_XSS($learnPath->error); } break; case 3: