WordPress 4.7.1

[autoinstalls/wordpress.git] / wp-mail.php

diff --git a/wp-mail.php b/wp-mail.php
index b5af05abf9300f24a80781c4fc2e12a161a8c7ee..35fb24aed2647d54d2b9ad7b6874f84cf2db198f 100644 (file)
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -12,7 +12,7 @@ require(dirname(__FILE__) . '/wp-load.php');
 
 /** This filter is documented in wp-admin/options.php */
 if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
 
 /** This filter is documented in wp-admin/options.php */
 if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )

-       wp_die( __( 'This action has been disabled by the administrator.' ) );
+       wp_die( __( 'This action has been disabled by the administrator.' ), 403 );

 
 $mailserver_url = get_option( 'mailserver_url' );
 
 
 $mailserver_url = get_option( 'mailserver_url' );
 


@@ -124,6 +124,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
                                        $author = trim($line);
                                $author = sanitize_email($author);
                                if ( is_email($author) ) {
                                        $author = trim($line);
                                $author = sanitize_email($author);
                                if ( is_email($author) ) {

+                                       /* translators: Post author email address */

                                        echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
                                        $userdata = get_user_by('email', $author);
                                        if ( ! empty( $userdata ) ) {
                                        echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
                                        $userdata = get_user_by('email', $author);
                                        if ( ! empty( $userdata ) ) {