clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4812 from tobiasd/20180411-noreply 

noreply should not be translate-able in email addresses
This commit is contained in:
Hypolite Petovan 2018-04-11 18:59:17 -04:00 committed by GitHub
parent 98c9aefcbb 0cab448ba1
commit d934425d62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.php
View File

@ -1062,7 +1062,7 @@ class App
$hostname = substr($hostname, 0, strpos($hostname, ':')); $hostname = substr($hostname, 0, strpos($hostname, ':'));
} }
$sender_email = L10n::t('noreply') . '@' . $hostname; $sender_email = 'noreply@' . $hostname;
} }
return $sender_email; return $sender_email;

2
src/Worker/Delivery.php
View File

@ -399,7 +399,7 @@ class Delivery {
$headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n"; $headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
} }
} else { } else {
$headers = 'From: '. Email::encodeHeader($local_user[0]['username'],'UTF-8') .' <'. L10n::t('noreply') .'@'.$a->get_hostname() .'>'. "\n"; $headers = 'From: '. Email::encodeHeader($local_user[0]['username'], 'UTF-8') . ' <noreply@' . $a->get_hostname() . '>' . "\n";
} }
//if ($reply_to) //if ($reply_to)