diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-13 15:29:49 +0100 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-13 15:29:49 +0100 |
| commit | 14928129ac979d50664cff367377db5364f8e663 (patch) | |
| tree | c244ebec8400361b7f084503f3ae40b2142647d5 /inc/media.php | |
| parent | bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a (diff) | |
| parent | ebb29737d32bc331541f78a1a47f33ba33919938 (diff) | |
| download | rpg-14928129ac979d50664cff367377db5364f8e663.tar.gz rpg-14928129ac979d50664cff367377db5364f8e663.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/inc/media.php b/inc/media.php index 3dacd12b7..69441352b 100644 --- a/inc/media.php +++ b/inc/media.php @@ -407,14 +407,9 @@ function media_notify($id,$file,$mime){ $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text); $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text); - $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); - $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id; - mail_send($conf['notify'],$subject,$text,$from); + mail_send($conf['notify'],$subject,$text,$conf['mailfrom']); } /** |