Changeset 14518

Timestamp:

05/08/2010 07:34:59 PM (16 years ago)

Author:

nacin

Message:

Adjust POP3 error checks in wp-mail.php. props solarissmoke, fixes #13163.

File:

• trunk/wp-mail.php (modified) (1 diff)

trunk/wp-mail.php

@@ -36 +36 @@
 
 $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.') );
 }