Merge remote-tracking branch 'origin/new/bug_3280'

This commit is contained in:
Paul Poulain 2012-07-03 18:17:44 +02:00
commit 9744c24ad8

View file

@ -65,7 +65,8 @@ if ( $email_add ) {
To => $email_add, To => $email_add,
From => $email_from, From => $email_from,
'Reply-To' => $email_replyto, 'Reply-To' => $email_replyto,
'X-Orig-IP' => $ENV{'REMOTE_ADDR'}, # 'X-Orig-IP' => $ENV{'REMOTE_ADDR'},
# FIXME Commented out for now: discussion on privacy issue
'X-Abuse-Report' => C4::Context->preference('KohaAdminEmailAddress'), 'X-Abuse-Report' => C4::Context->preference('KohaAdminEmailAddress'),
); );