From: paca70 <paca70>
Date: Tue, 23 Nov 2004 21:29:21 +0000 (+0000)
Subject: Closed bug #2209
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e80c7d5d1529547c9cfbfd4d62323513a9d70163;p=moodle.git

Closed bug #2209
Don't replace & if it's part of encoded character.
---

diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index e22181c50b..ff513e0a5c 100644
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -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);
 }