diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-01-14 19:05:09 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-01-14 19:05:09 +0000 |
commit | eeaa9f9ac9cfb3d6bd2d4ce361c407f9c6acb698 (patch) | |
tree | 976eafb3f689b0225a11510807492b787701a8e0 | |
parent | 521aff819ab185143b5d9cb2d3c68d10bba28420 (diff) | |
download | wordpress-mu-eeaa9f9ac9cfb3d6bd2d4ce361c407f9c6acb698.tar.gz wordpress-mu-eeaa9f9ac9cfb3d6bd2d4ce361c407f9c6acb698.tar.xz wordpress-mu-eeaa9f9ac9cfb3d6bd2d4ce361c407f9c6acb698.zip |
Replace wordpress.com with localhost.localdomain example email
Use site admin email on non-activated blogs
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1186 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r-- | wp-includes/class-phpmailer.php | 2 | ||||
-rw-r--r-- | wp-settings.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wp-includes/class-phpmailer.php b/wp-includes/class-phpmailer.php index acacabb..60b2da6 100644 --- a/wp-includes/class-phpmailer.php +++ b/wp-includes/class-phpmailer.php @@ -58,7 +58,7 @@ class PHPMailer * Sets the From email address for the message. * @var string */ - var $From = "support@wordpress.com"; + var $From = "support@localhost.localdomain"; /** * Sets the From name of the message. diff --git a/wp-settings.php b/wp-settings.php index 292f5d4..f61342f 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -269,7 +269,7 @@ if ( '1' == $current_blog->deleted ) graceful_fail(__('This user has elected to delete their account and the content is no longer available.')); if ( '2' == $current_blog->deleted ) - graceful_fail(sprintf(__('This blog has not been activated yet. If you are having problems activating your blog, please contact <a href="mailto:support@{%1$s}">support@{%1$s}</a>.'), $current_site->domain)); + graceful_fail(sprintf(__('This blog has not been activated yet. If you are having problems activating your blog, please contact <a href="mailto:%1$s">%1$s</a>.'), get_site_option( 'admin_email', "support@{$current_site->domain}" ))); if( $current_blog->archived == '1' ) graceful_fail(__('This blog has been archived or suspended.')); |