Permalink
Browse files

moving the pop3->delete call to the end of the loop so that emails ar…

…e deleted if and only if a post is made successfully

git-svn-id: http://svn.automattic.com/wordpress/trunk@2176 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent dac4a93 commit 65950b5a8d2ac61e603aa85f4e4c835c726d5e50 michelvaldrighi committed Jan 31, 2005
Showing with 26 additions and 21 deletions.
  1. +26 −21 wp-mail.php
View
@@ -24,14 +24,6 @@
$message = $pop3->get($i);
- if(!$pop3->delete($i)) {
- echo '<p>Oops '.$pop3->ERROR.'</p></div>';
- $pop3->reset();
- exit;
- } else {
- echo "<p>Mission complete, message <strong>$i</strong> deleted.</p>";
- }
-
$content = '';
$content_type = '';
$boundary = '';
@@ -144,6 +136,11 @@
$post_ID = wp_insert_post($post_data);
+ if (!$post_ID) {
+ // we couldn't post, for whatever reason. better move forward to the next email
+ continue;
+ }
+
do_action('publish_phone', $post_ID);
echo "\n<p><b>Author:</b> $post_author</p>";
@@ -152,20 +149,28 @@
if (!$post_categories) $post_categories[] = 1;
foreach ($post_categories as $post_category) :
- $post_category = intval($post_category);
-
- // Double check it's not there already
- $exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_ID AND category_id = $post_category");
-
- if (!$exists && $result) {
- $wpdb->query("
- INSERT INTO $wpdb->post2cat
- (post_id, category_id)
- VALUES
- ($post_ID, $post_category)
- ");
+ $post_category = intval($post_category);
+
+ // Double check it's not there already
+ $exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_ID AND category_id = $post_category");
+
+ if (!$exists && $result) {
+ $wpdb->query("
+ INSERT INTO $wpdb->post2cat
+ (post_id, category_id)
+ VALUES
+ ($post_ID, $post_category)
+ ");
+ }
+ endforeach;
+
+ if(!$pop3->delete($i)) {
+ echo '<p>Oops '.$pop3->ERROR.'</p></div>';
+ $pop3->reset();
+ exit;
+ } else {
+ echo "<p>Mission complete, message <strong>$i</strong> deleted.</p>";
}
-endforeach;
endfor;

0 comments on commit 65950b5

Please sign in to comment.