From 07044d86ce6f3ee85bdb07209f66e3b55fdcd846 Mon Sep 17 00:00:00 2001
From: patrik2020 <patrik.pucer@gmail.com>
Date: Wed, 21 Sep 2022 21:51:07 +0200
Subject: [PATCH] Latex za izvoze: (IZVOZ-103): Resitev za  Pdf izvoz
 vprasalnika ne deluje, ce blok vsebuje znak &

---
 .../export/latexclasses/class.LatexSurveyElement.php     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php
index b235ffec0..25c21c106 100644
--- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php
+++ b/admin/survey/export/latexclasses/class.LatexSurveyElement.php
@@ -259,8 +259,9 @@ class LatexSurveyElement{
 					$parents = Cache::srv_branching($spremenljivke['id'], 0)['parent'];
 					//echo "parents: ".$parents."</br>";
 					if($parents){
-						$tex .= $this->displayIf($parents);	
-						//echo "blok: ".$this->displayIf($parents)."</br>";					
+						$tex .= $this->encodeText($this->displayIf($parents));	
+						//$tex .= $this->displayIf($parents);
+						//echo "blok: ".$this->encodeText($this->displayIf($parents))."</br>";					
 						$tex .= $this->texNewLine;
 					}
 					#preuredil kodo, da zadeva deluje tako kot ta stara, ki se nahaja nad tem
@@ -934,9 +935,9 @@ class LatexSurveyElement{
 		$text = str_replace('_','\_ ',$text);	
 		$text = str_replace('~','\textasciitilde{} ',$text);		
 		if(strpos($text, '&amp;')){	//ce je prisotno v besedilu &amp;'
-			$text = str_replace('&amp;','\& ',$text);	
+			$text = str_replace('&amp;','\&',$text);	
 		}else{
-			$text = str_replace('&','\& ',$text);				
+			$text = str_replace('&','\&',$text);				
 		}
 		$text = str_replace('&nbsp;','~',$text);
 		//$text = str_replace('&lt;','\textless ',$text);