]> git.mjollnir.org Git - moodle.git/commitdiff
Closed bug #2209
authorpaca70 <paca70>
Tue, 23 Nov 2004 21:29:21 +0000 (21:29 +0000)
committerpaca70 <paca70>
Tue, 23 Nov 2004 21:29:21 +0000 (21:29 +0000)
Don't replace & if it's part of encoded character.

mod/wiki/ewiki/ewiki.php

index e22181c50b10ea09b64fdba78f746d36de3ea90c..ff513e0a5ccebb4c43ecbeed7262ba500988006c 100644 (file)
@@ -860,7 +860,7 @@ function ewiki_script($asid="", $id=false, $params="", $bin=0, $html=1, $script=
 
    #-- fin
    if ($html) {
-      $url = str_replace("&", "&amp;", $url);
+      $url = preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,5};)/","&uml;", $url);
    }
    return($url);
 }