diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2007-06-13 17:27:12 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2007-06-13 17:27:12 +0200 |
| commit | c9321d914faa3e35ad2bfc961b414f870691656b (patch) | |
| tree | 8e465e5ffe96e4cc4551adb359d266c22bb9f74c /inc/common.php | |
| parent | 6496112aeffe0c7c252949962e42cdb8f56ebebd (diff) | |
| download | rpg-c9321d914faa3e35ad2bfc961b414f870691656b.tar.gz rpg-c9321d914faa3e35ad2bfc961b414f870691656b.tar.bz2 | |
no ampersand encoding in URLs for emails FS#1157
darcs-hash:20070613152712-7ad00-903176f9d5632ab1f26a4d8849f7eb7523134874.gz
Diffstat (limited to 'inc/common.php')
| -rw-r--r-- | inc/common.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/common.php b/inc/common.php index 8e7cfa54f..673afc1a6 100644 --- a/inc/common.php +++ b/inc/common.php @@ -850,7 +850,7 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){ $text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text); $text = str_replace('@IPADDRESS@',$_SERVER['REMOTE_ADDR'],$text); $text = str_replace('@HOSTNAME@',gethostbyaddr($_SERVER['REMOTE_ADDR']),$text); - $text = str_replace('@NEWPAGE@',wl($id,'',true),$text); + $text = str_replace('@NEWPAGE@',wl($id,'',true,'&'),$text); $text = str_replace('@PAGE@',$id,$text); $text = str_replace('@TITLE@',$conf['title'],$text); $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text); @@ -865,7 +865,7 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){ $subject = $lang['mail_new_user'].' '.$summary; }elseif($rev){ $subject = $lang['mail_changed'].' '.$id; - $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true),$text); + $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text); require_once(DOKU_INC.'inc/DifferenceEngine.php'); $df = new Diff(split("\n",rawWiki($id,$rev)), split("\n",rawWiki($id))); |