diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-06-24 11:32:51 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-06-24 11:32:51 +0300 |
| commit | a2dc299eb0593f35454deb21a2cb5d51a235e80a (patch) | |
| tree | 5b14bf906bbd13495826ebbe86d3af1c8fd88f71 /inc/media.php | |
| parent | 70c3cc9a17d47d8986cba0805d943c1a68af1740 (diff) | |
| parent | c949174a2e8c324e3e463a9d10e9e6dc07b0ba9e (diff) | |
| download | rpg-a2dc299eb0593f35454deb21a2cb5d51a235e80a.tar.gz rpg-a2dc299eb0593f35454deb21a2cb5d51a235e80a.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revisions
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 19aee0d06..f316bc34e 100644 --- a/inc/media.php +++ b/inc/media.php @@ -492,7 +492,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']); } |