WordPress 3.6.1-scripts

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

diff --git a/wp-mail.php b/wp-mail.php
index 7fc3967b6a74ff7132f5849ce8942a8522435141..27290b11151fcd2429aa9418cc306c56a0d7bf3f 100644 (file)
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -30,7 +30,7 @@ if ( $last_checked )
 
 set_transient('mailserver_last_checked', true, WP_MAIL_INTERVAL);
 
-$time_difference = get_option('gmt_offset') * 3600;
+$time_difference = get_option('gmt_offset') * HOUR_IN_SECONDS;
 
 $phone_delim = '::';
 
@@ -202,7 +202,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
        $post_category = array(get_option('default_email_category'));
 
        $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
-       $post_data = add_magic_quotes($post_data);
+       $post_data = wp_slash($post_data);
 
        $post_ID = wp_insert_post($post_data);
        if ( is_wp_error( $post_ID ) )