diff options
| author | Anika Henke <anika@selfthinker.org> | 2010-11-07 09:55:17 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2010-11-07 09:55:17 +0000 |
| commit | 23b10d5bcbfb9a11561296670425bc22665fb84c (patch) | |
| tree | 745e07587c4f3feab0d56b9f9e1ed911b75511cc /inc/common.php | |
| parent | f5baf821ee5f6ab5b009bb94aff6f43f686d3329 (diff) | |
| parent | 9c1c56fd8f997025e879c7a36f6d3c5022b925ae (diff) | |
| download | rpg-23b10d5bcbfb9a11561296670425bc22665fb84c.tar.gz rpg-23b10d5bcbfb9a11561296670425bc22665fb84c.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/common.php')
| -rw-r--r-- | inc/common.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/inc/common.php b/inc/common.php index 3e760419f..881179f4b 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1134,12 +1134,7 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){ $subject = '['.utf8_substr($conf['title'], 0, 20).'...] '.$subject; } - $from = $conf['mailfrom']; - $from = str_replace('@USER@',$_SERVER['REMOTE_USER'],$from); - $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from); - $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from); - - mail_send($to,$subject,$text,$from,'',$bcc); + mail_send($to,$subject,$text,$conf['mailfrom'],'',$bcc); } /** |