Wordpress 3.0.5

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

diff --git a/wp-mail.php b/wp-mail.php
index cbc47315907c6b0b323a033f1fdd9d19d6921c46..69b54156eb43d3a6a4baebb9d06291169eebcb55 100644 (file)
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -10,6 +10,9 @@
 /** Make sure that the WordPress bootstrap has run before continuing. */
 require(dirname(__FILE__) . '/wp-load.php');
 
+if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
+       wp_die( __( 'This action has been disabled by the administrator.' ) );
+
 /** Allow a plugin to do a complete takeover of Post by Email **/
 do_action('wp-mail.php');
 
@@ -32,13 +35,18 @@ $time_difference = get_option('gmt_offset') * 3600;
 $phone_delim = '::';
 
 $pop3 = new POP3();
-$count = 0;
 
-if ( ! $pop3->connect(get_option('mailserver_url'), get_option('mailserver_port') ) ||
-       ! $pop3->user(get_option('mailserver_login')) ||
-       ( ! $count = $pop3->pass(get_option('mailserver_pass')) ) ) {
-               $pop3->quit();
-               wp_die( ( 0 === $count ) ? __('There doesn’t seem to be any new mail.') : esc_html($pop3->ERROR) );
+if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
+       wp_die( esc_html( $pop3->ERROR ) );
+
+$count = $pop3->pass( get_option('mailserver_pass') );
+
+if( false === $count )
+       wp_die( esc_html( $pop3->ERROR ) );
+
+if( 0 === $count ) {
+       $pop3->quit();
+       wp_die( __('There doesn’t seem to be any new mail.') );
 }
 
 for ( $i = 1; $i <= $count; $i++ ) {