fixing the ampersands broke escaping the other characters ... this should help

lennyjpg · lennyjpg · commit 447b6111b652 · 2006-01-24T02:05:48.000Z
diff --git a/generate/lib/functions.inc.php b/generate/lib/functions.inc.php
@@ -198,12 +198,12 @@ function convertToFilename($string, $translation = false)
 
 function chars($string)
 {
+	$string = str_replace('& ', '&amp; ', $string);
+	$string = str_replace('&&', '&amp;&amp;', $string);
     $string = str_replace(' > ', ' &gt; ', $string);
     $string = str_replace(' < ', ' &lt; ', $string);
     $string = str_replace('<<', '&lt;&lt;', $string);
     $string = str_replace('>>', '&gt;&gt;', $string);
-    $string = str_replace('& ', '&amp; ', $string);
-	$string = str_replace('&&', '&amp;&amp;', $string);
     $string = stripslashes($string);
     return $string;
 }

Original file line number	Diff line number	Diff line change
`@@ -198,12 +198,12 @@ function convertToFilename($string, $translation = false)`
`198`	`198`
`199`	`199`	`function chars($string)`
`200`	`200`	`{`
	`201`	`+ $string = str_replace('& ', '& ', $string);`
	`202`	`+ $string = str_replace('&&', '&&', $string);`
`201`	`203`	`$string = str_replace(' > ', ' > ', $string);`
`202`	`204`	`$string = str_replace(' < ', ' < ', $string);`
`203`	`205`	`$string = str_replace('<<', '<<', $string);`
`204`	`206`	`$string = str_replace('>>', '>>', $string);`
`205`		`- $string = str_replace('& ', '& ', $string);`
`206`		`- $string = str_replace('&&', '&&', $string);`
`207`	`207`	`$string = stripslashes($string);`
`208`	`208`	`return $string;`
`209`	`209`	`}`