diff --git a/admin/email_queue.php b/admin/email_queue.php index 1f6f9bc7c8..670e63abe7 100644 --- a/admin/email_queue.php +++ b/admin/email_queue.php @@ -73,7 +73,6 @@ $t_email_data->email = config_get_global( 'webmaster_email' ); $t_email_data->subject = 'Testing PHP mail() function'; $t_email_data->body = 'Your PHP mail settings appear to be correctly set.'; - $t_email_data->metadata['priority'] = config_get( 'mail_priority' ); $t_email_data->metadata['charset'] = 'utf-8'; $t_result = email_send( $t_email_data ); diff --git a/config_defaults_inc.php b/config_defaults_inc.php index ac99ef1cd7..795a833791 100644 --- a/config_defaults_inc.php +++ b/config_defaults_inc.php @@ -594,14 +594,6 @@ */ $g_show_user_realname_threshold = NOBODY; -/** - * If use_x_priority is set to ON, what should the value be? - * Urgent = 1, Not Urgent = 5, Disable = 0 - * Note: some MTAs interpret X-Priority = 0 to mean 'Very Urgent' - * @global integer $g_mail_priority - */ -$g_mail_priority = 3; - /** * select the method to mail by: * PHPMAILER_METHOD_MAIL - mail() @@ -4466,7 +4458,6 @@ 'logout_redirect_page', 'long_process_timeout', 'lost_password_feature', - 'mail_priority', 'manage_config_cookie', 'manage_configuration_threshold', 'manage_custom_fields_threshold', diff --git a/core/email_api.php b/core/email_api.php index bf512e86c3..99e5aeb9db 100644 --- a/core/email_api.php +++ b/core/email_api.php @@ -994,7 +994,6 @@ function email_store( $p_recipient, $p_subject, $p_message, array $p_headers = n $t_email_data->body = $t_message; $t_email_data->metadata = array(); $t_email_data->metadata['headers'] = $p_headers === null ? array() : $p_headers; - $t_email_data->metadata['priority'] = config_get( 'mail_priority' ); # Urgent = 1, Not Urgent = 5, Disable = 0 $t_email_data->metadata['charset'] = 'utf-8'; @@ -1143,7 +1142,6 @@ function email_send( EmailData $p_email_data ) { $t_mail->IsHTML( false ); # set email format to plain text $t_mail->WordWrap = 80; # set word wrap to 80 characters - $t_mail->Priority = $t_email_data->metadata['priority']; # Urgent = 1, Not Urgent = 5, Disable = 0 $t_mail->CharSet = $t_email_data->metadata['charset']; $t_mail->Host = config_get( 'smtp_host' ); $t_mail->From = config_get( 'from_email' ); diff --git a/core/obsolete.php b/core/obsolete.php index f73064bf95..7c98b561c8 100644 --- a/core/obsolete.php +++ b/core/obsolete.php @@ -195,3 +195,6 @@ config_obsolete( 'csv_add_bom' ); config_obsolete( 'hr_size' ); config_obsolete( 'hr_width' ); + +# changes in 1.3.4 +config_obsolete( 'mail_priority' ); diff --git a/docbook/Admin_Guide/en-US/config/email.xml b/docbook/Admin_Guide/en-US/config/email.xml index 297f87d50a..aab8cc74c3 100644 --- a/docbook/Admin_Guide/en-US/config/email.xml +++ b/docbook/Admin_Guide/en-US/config/email.xml @@ -263,15 +263,6 @@ $g_notify_flags['new'] = array( - - $g_mail_priority - - If use_x_priority is set to ON, what should the value be? - Urgent = 1, Not Urgent = 5, Disable = 0 . Default is 3 - Some MTAs interpret X-Priority = 0 to mean 'Very Urgent' - - - $g_phpMailer_method