| 1 | --- ms-functions.php 2015-12-14 16:06:05.000000000 +-0200
|
|---|
| 2 | +++ ms-functions.php 2016-02-18 10:40:24.000000000 +-0200
|
|---|
| 3 | @@ -1453,18 +1453,12 @@
|
|---|
| 4 | --The Team @ SITE_NAME' );
|
|---|
| 5 | }
|
|---|
| 6 |
|
|---|
| 7 | $url = get_blogaddress_by_id($blog_id);
|
|---|
| 8 | $user = get_userdata( $user_id );
|
|---|
| 9 |
|
|---|
| 10 | - $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
|
|---|
| 11 | - $welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
|
|---|
| 12 | - $welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
|
|---|
| 13 | - $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
|
|---|
| 14 | - $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
|
|---|
| 15 |
|
|---|
| 16 | /**
|
|---|
| 17 | * Filter the content of the welcome email after site activation.
|
|---|
| 18 | *
|
|---|
| 19 | * Content should be formatted for transmission via wp_mail().
|
|---|
| 20 | *
|
|---|
| 21 | * @since MU
|
|---|
| 22 | @@ -1474,12 +1468,18 @@
|
|---|
| 23 | * @param int $user_id User ID.
|
|---|
| 24 | * @param string $password User password.
|
|---|
| 25 | * @param string $title Site title.
|
|---|
| 26 | * @param array $meta Signup meta data.
|
|---|
| 27 | */
|
|---|
| 28 | $welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
|
|---|
| 29 | + $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
|
|---|
| 30 | + $welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
|
|---|
| 31 | + $welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
|
|---|
| 32 | + $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
|
|---|
| 33 | + $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
|
|---|
| 34 |
|
|---|
| 35 | $admin_email = get_site_option( 'admin_email' );
|
|---|
| 36 |
|
|---|
| 37 | if ( $admin_email == '' )
|
|---|
| 38 | $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
|
|---|
| 39 |
|
|---|
| 40 | $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
|
|---|
| 41 |
|
|---|
![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
