root@zapp:/var/www/mantis/core# diff email_api.php email_api.php.old
784c784
< function email_store( $p_recipient, $p_subject, $p_message, $p_headers = null, $p_project_id = null ) {
---
> function email_store( $p_recipient, $p_subject, $p_message, $p_headers = null ) {
803,808c803,804
<       // ###
<       $t_email_data->metadata['priority'] = config_get( 'mail_priority', null, null, $p_project_id );
<       $t_email_data->metadata['from_email'] = config_get( 'from_email', null, null, $p_project_id);
<       $t_email_data->metadata['return_path_email'] = config_get( 'return_path_email', null, null, $p_project_id);
<       $t_email_data->metadata['from_name'] = config_get( 'from_name', null, null, $p_project_id);
<       // ###end
---
>       $t_email_data->metadata['priority'] = config_get( 'mail_priority' );
>
942,967c938,941
<       // ###
<       if (is_blank($t_email_data->metadata['from_email']))
<       {
<               $mail->From = config_get( 'from_email' );
<       }
<       else
<       {
<               $mail->From = $t_email_data->metadata['from_email'];
<       }
<       if (is_blank($t_email_data->metadata['return_path_email']))
<         {
<               $mail->Sender = config_get( 'return_path_email' );
<       }
<       else
<       {
<               $mail->Sender = $t_email_data->metadata['return_path_email'];
<       }
<       if (is_blank($t_email_data->metadata['from_name']))
<       {
<               $mail->FromName = config_get( 'from_name' );
<       }
<       else
<       {
<               $mail->FromName = $t_email_data->metadata['from_name'];
<       }
<       // ### END
---
>       $mail->From = config_get( 'from_email' );
>       $mail->Sender = config_get( 'return_path_email' );
>       $mail->FromName = config_get( 'from_name' );
>
1218,1219c1192
<       // ###
<       $t_ok = email_store( $t_user_email, $t_subject, $t_message, $t_mail_headers, $p_project_id );
---
>       $t_ok = email_store( $t_user_email, $t_subject, $t_message, $t_mail_headers );