Wordpress 2.8.2

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

diff --git a/wp-mail.php b/wp-mail.php
index 2966dc3642cfb0b0553e37ee6067905523b2e492..4dc4ed019e5bb04586d2cd1da99fb3c03a86952a 100644 (file)
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -13,7 +13,7 @@ require(dirname(__FILE__) . '/wp-load.php');
 /** Get the POP3 class with which to access the mailbox. */
 require_once( ABSPATH . WPINC . '/class-pop3.php' );
 
-$time_difference = absint(get_option('gmt_offset')) * 3600;
+$time_difference = get_option('gmt_offset') * 3600;
 
 $phone_delim = '::';
 
@@ -23,7 +23,7 @@ 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.") : wp_specialchars($pop3->ERROR) );
+               wp_die( ( 0 === $count ) ? __('There doesn’t seem to be any new mail.') : esc_html($pop3->ERROR) );
 }
 
 for ( $i = 1; $i <= $count; $i++ ) {
@@ -156,6 +156,10 @@ for ( $i = 1; $i <= $count; $i++ ) {
        }
        $content = trim($content);
 
+       //Give Post-By-Email extending plugins full access to the content
+       //Either the raw content or the content of the last quoted-printable section
+       $content = apply_filters('wp_mail_original_content', $content);
+
        if ( false !== stripos($content_transfer_encoding, "quoted-printable") ) {
                $content = quoted_printable_decode($content);
        }
@@ -191,11 +195,11 @@ for ( $i = 1; $i <= $count; $i++ ) {
 
        do_action('publish_phone', $post_ID);
 
-       echo "\n<p>" . sprintf(__('<strong>Author:</strong> %s'), wp_specialchars($post_author)) . '</p>';
-       echo "\n<p>" . sprintf(__('<strong>Posted title:</strong> %s'), wp_specialchars($post_title)) . '</p>';
+       echo "\n<p>" . sprintf(__('<strong>Author:</strong> %s'), esc_html($post_author)) . '</p>';
+       echo "\n<p>" . sprintf(__('<strong>Posted title:</strong> %s'), esc_html($post_title)) . '</p>';
 
        if(!$pop3->delete($i)) {
-               echo '<p>' . sprintf(__('Oops: %s'), wp_specialchars($pop3->ERROR)) . '</p>';
+               echo '<p>' . sprintf(__('Oops: %s'), esc_html($pop3->ERROR)) . '</p>';
                $pop3->reset();
                exit;
        } else {