From 427fd3cc91f3a9d5ccfba4cfad402d45b40cf103 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Thu, 9 Jun 2011 23:05:06 +0200
Subject: [PATCH] Use mailprefix for media upload emails too (see also FS#2021)
---
inc/media.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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']);
}
--
GitLab