diff options
| author | Guy Brand <gb@unistra.fr> | 2011-06-09 23:05:06 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2011-06-09 23:05:06 +0200 |
| commit | 427fd3cc91f3a9d5ccfba4cfad402d45b40cf103 (patch) | |
| tree | 81c1135a8b22ac8048262833eeb2002cccf67ea1 /inc/media.php | |
| parent | ed5218f1f645be768bb36518b24885923f980b90 (diff) | |
| download | rpg-427fd3cc91f3a9d5ccfba4cfad402d45b40cf103.tar.gz rpg-427fd3cc91f3a9d5ccfba4cfad402d45b40cf103.tar.bz2 | |
Use mailprefix for media upload emails too (see also FS#2021)
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/inc/media.php b/inc/media.php index dcef25cfd..10da501b0 100644 --- a/inc/media.php +++ b/inc/media.php @@ -435,7 +435,11 @@ function media_notify($id,$file,$mime){ $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text); $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text); - $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id; + if(empty($conf['mailprefix'])) { + $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id; + } else { + $subject = '['.$conf['mailprefix'].'] '.$lang['mail_upload'].' '.$id; + } mail_send($conf['notify'],$subject,$text,$conf['mailfrom']); } |