diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-11-07 17:38:39 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-11-07 17:38:39 +0100 |
| commit | 7a94cade57d6c4514101c374d895ed278c05bbb1 (patch) | |
| tree | 774de9d9c7c47a9e43c5ad6560bdea1a6bb94a7f /inc/media.php | |
| parent | 0ae96b5697f1f1fe192e5eade99490c475467b84 (diff) | |
| parent | eb97dcb864e05302756dcec4320c3c41866e4217 (diff) | |
| download | rpg-7a94cade57d6c4514101c374d895ed278c05bbb1.tar.gz rpg-7a94cade57d6c4514101c374d895ed278c05bbb1.tar.bz2 | |
Merge branch 'master' into stable
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']); } /** |