diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
| commit | 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 (patch) | |
| tree | 2a06e5261263c68d8afd95a6328879dc289cb909 /wp-mail.php | |
| parent | b83c34a7010faee0223f6037025c350da12e05e6 (diff) | |
| download | wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.gz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.xz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.zip | |
Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-mail.php')
| -rw-r--r-- | wp-mail.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wp-mail.php b/wp-mail.php index ebe81bd..5f11cb1 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -108,7 +108,7 @@ for ($i=1; $i <= $count; $i++) : } endforeach; - $subject = trim(str_replace(get_option('subjectprefix'), '', $subject)); + $subject = trim($subject); if ($content_type == 'multipart/alternative') { $content = explode('--'.$boundary, $content); @@ -117,7 +117,7 @@ for ($i=1; $i <= $count; $i++) : $content = strip_tags($content[1], '<img><p><br><i><b><u><em><strong><strike><font><span><div>'); } $content = trim($content); - + if (stripos($content_transfer_encoding, "quoted-printable") !== false) { $content = quoted_printable_decode($content); } @@ -148,6 +148,8 @@ for ($i=1; $i <= $count; $i++) : $post_data = add_magic_quotes($post_data); $post_ID = wp_insert_post($post_data); + if ( is_wp_error( $post_ID ) ) + echo "\n" . $post_ID->get_error_message(); if (!$post_ID) { // we couldn't post, for whatever reason. better move forward to the next email |