diff options
| author | lisps <stummp@loewen.de> | 2014-03-19 08:07:16 +0100 |
|---|---|---|
| committer | lisps <stummp@loewen.de> | 2014-03-19 08:07:16 +0100 |
| commit | e310313d794a3336d279ee09973508e794dbf08e (patch) | |
| tree | 7f90b51d344f7163c6fbb109f04ff22dea5ae129 /inc/mail.php | |
| parent | cdb5e9613f7c4b1be4515715652aca451493d5d5 (diff) | |
| parent | 177ef92c4ddd38cb906dd7d5f0208c698048cd57 (diff) | |
| download | rpg-e310313d794a3336d279ee09973508e794dbf08e.tar.gz rpg-e310313d794a3336d279ee09973508e794dbf08e.tar.bz2 | |
Merge remote-tracking branch 'remotes/origin/master' into revisions_local
Diffstat (limited to 'inc/mail.php')
| -rw-r--r-- | inc/mail.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/inc/mail.php b/inc/mail.php index 0b60c0a5b..9994ac63e 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -40,6 +40,8 @@ if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '[' function mail_setup(){ global $conf; global $USERINFO; + /** @var Input $INPUT */ + global $INPUT; // auto constructed address $host = @parse_url(DOKU_URL,PHP_URL_HOST); @@ -53,11 +55,8 @@ function mail_setup(){ $replace['@MAIL@'] = $noreply; } - if(!empty($_SERVER['REMOTE_USER'])){ - $replace['@USER@'] = $_SERVER['REMOTE_USER']; - }else{ - $replace['@USER@'] = 'noreply'; - } + // use 'noreply' if no user + $replace['@USER@'] = $INPUT->server->str('REMOTE_USER', 'noreply', true); if(!empty($USERINFO['name'])){ $replace['@NAME@'] = $USERINFO['name']; |