Changeset 6357

Timestamp:

12/05/2007 07:39:07 AM (17 years ago)

Author:

westi

Message:

Ensure wp-mail doesn't issue a 500 error if no messages are available to post. Fixed #5420 props Bobcat

File:

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

trunk/wp-mail.php

@@ -15 +15 @@
     wp_die($pop3->ERROR);
 
-$count = $pop3->login(get_option('mailserver_login'), get_option('mailserver_pass'));
-if (0 == $count) wp_die(__('There doesn’t seem to be any new mail.'));
-
+if (!$pop3->user(get_option('mailserver_login')))
+    wp_die($pop3->ERROR);
+
+$count = $pop3->pass(get_option('mailserver_pass'));
+if (false === $count)
+    wp_die($pop3->ERROR);
+if (0 == $count)
+    echo "<p>There doesn't seem to be any new mail.</p>\n"; // will fall-through to end of for loop
 
 for ($i=1; $i <= $count; $i++) :