diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-31 14:55:29 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-31 14:55:29 +0000 |
| commit | b764f60728be1d4e026f9d7ae618ab47e23322f8 (patch) | |
| tree | 1f1b45c4f1c1cf027b3240f605346e56209be8ff /wp-mail.php | |
| parent | dad010666b767a1d06588d1d09c771c62f67c387 (diff) | |
| download | wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.gz wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.xz wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.zip | |
WP Merge to rev #4147
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-mail.php')
| -rw-r--r-- | wp-mail.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wp-mail.php b/wp-mail.php index 920beff..ded37bd 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -5,16 +5,16 @@ require_once(ABSPATH.WPINC.'/class-pop3.php'); error_reporting(2037); -$time_difference = get_settings('gmt_offset') * 3600; +$time_difference = get_option('gmt_offset') * 3600; $phone_delim = '::'; $pop3 = new POP3(); -if (!$pop3->connect(get_settings('mailserver_url'), get_settings('mailserver_port'))) +if (!$pop3->connect(get_option('mailserver_url'), get_option('mailserver_port'))) wp_die($pop3->ERROR); -$count = $pop3->login(get_settings('mailserver_login'), get_settings('mailserver_pass')); +$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.')); @@ -102,7 +102,7 @@ for ($i=1; $i <= $count; $i++) : } endforeach; - $subject = trim(str_replace(get_settings('subjectprefix'), '', $subject)); + $subject = trim(str_replace(get_option('subjectprefix'), '', $subject)); if ($content_type == 'multipart/alternative') { $content = explode('--'.$boundary, $content); @@ -126,7 +126,7 @@ for ($i=1; $i <= $count; $i++) : if ($post_title == '') $post_title = $subject; - if (empty($post_categories)) $post_categories[] = get_settings('default_email_category'); + if (empty($post_categories)) $post_categories[] = get_option('default_email_category'); $post_category = $post_categories; |