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/media.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/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']); } /** |