Changeset 1186

Show
Ignore:
Timestamp:
01/14/08 19:05:09 (11 months ago)
Author:
donncha
Message:

Replace wordpress.com with localhost.localdomain example email
Use site admin email on non-activated blogs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/class-phpmailer.php

    r1069 r1186  
    5959     * @var string 
    6060     */ 
    61     var $From               = "support@wordpress.com"; 
     61    var $From               = "support@localhost.localdomain"; 
    6262 
    6363    /** 

  • trunk/wp-settings.php

    r1172 r1186  
    270270 
    271271if ( '2' == $current_blog->deleted ) 
    272                 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)); 
     272                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}" ))); 
    273273 
    274274if( $current_blog->archived == '1' )