Index: branches/unlabeled/unlabeled-1.69.2/core/kernel/processors/main_processor.php
===================================================================
diff -u -r8299 -r8309
--- branches/unlabeled/unlabeled-1.69.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 8299)
+++ branches/unlabeled/unlabeled-1.69.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 8309)
@@ -435,9 +435,9 @@
 		// m:phrase name="phrase_name" default="Tr-alala" updated="2004-01-29 12:49"
 		if (array_key_exists('default', $params)) return $params['default']; //backward compatibility
 		$translation = $this->Application->Phrase($this->SelectParam($params, 'label,name,title'));
+		
 		if (getArrayValue($params, 'escape')) {
-			$translation = htmlspecialchars($translation);
-			$translation = str_replace('\'', ''', $translation);
+			$translation = htmlspecialchars($translation, ENT_QUOTES);
 			$translation = addslashes($translation);
 		}
 		return $translation;
Index: branches/unlabeled/unlabeled-1.17.2/core/kernel/processors/tag_processor.php
===================================================================
diff -u -r7934 -r8309
--- branches/unlabeled/unlabeled-1.17.2/core/kernel/processors/tag_processor.php	(.../tag_processor.php)	(revision 7934)
+++ branches/unlabeled/unlabeled-1.17.2/core/kernel/processors/tag_processor.php	(.../tag_processor.php)	(revision 8309)
@@ -76,7 +76,6 @@
 				$this->Special = $backup_special;
 
 				if ($flag_values['js_escape']) {
-					$ret = str_replace('\'', ''', $ret);
 					$ret = addslashes($ret);
 					$ret = str_replace(Array("\r", "\n"), Array('\r', '\n'), $ret);
 					$ret = str_replace('</script>', "</'+'script>", $ret);