Merge pull request #14972 from code-chicken/patch-7

Fix for #14957 and probably a lot of other issues

htdocs/includes/odtphp/odf.php

@@ -156,6 +156,7 @@ class Odf
      */
 	public function convertVarToOdf($value, $encode = true, $charset = 'ISO-8859')
 	{
+		$value = $encode ? htmlspecialchars($value) : $value;
 		$value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
 		$convertedValue = $value;