Merge branch 'patch-6' of https://github.com/tristanlins/contao-core into hotfix/3.4.1

leofeyer · leofeyer · commit 702de82d1192 · 2015-01-21T13:46:27.000+01:00
diff --git a/system/modules/core/library/Contao/System.php b/system/modules/core/library/Contao/System.php
@@ -709,7 +709,7 @@ protected static function convertXlfToPhp($strName, $strLanguage, $blnLoad=false
 
 			if (strpos($value, '\n') !== false)
 			{
-				return '"' . str_replace('"', '\\"', $value) . '"';
+				return '"' . str_replace(array('$', '"'), array('\\$', '\\"'), $value) . '"';
 			}
 			else
 			{

Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ protected static function convertXlfToPhp($strName, $strLanguage, $blnLoad=false`
`709`	`709`
`710`	`710`	`if (strpos($value, '\n') !== false)`
`711`	`711`	`{`
`712`		`- return '"' . str_replace('"', '\\"', $value) . '"';`
	`712`	`+ return '"' . str_replace(array('$', '"'), array('\\$', '\\"'), $value) . '"';`
`713`	`713`	`}`
`714`	`714`	`else`
`715`	`715`	`{`