IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements to queries in populate_network(), also gettext, props nacin, see #11816

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru
2010-01-27 19:13:00 +00:00
parent 65ac9b6827
commit cda3031b06
3 changed files with 67 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/ms-functions.php
View File

@@ -1466,7 +1466,7 @@ function wpmu_welcome_notification($blog_id, $user_id, $password, $title, $meta
$welcome_email = stripslashes( get_site_option( 'welcome_email' ) );
if ( $welcome_email == false )
$welcome_email = stripslashes( __( "Dear User,
$welcome_email = stripslashes( __( 'Dear User,
Your new SITE_NAME blog has been successfully set up at:
BLOG_URL
@@ -1476,11 +1476,10 @@ Username: USERNAME
Password: PASSWORD
Login Here: BLOG_URLwp-login.php
We hope you enjoy your new weblog.
We hope you enjoy your new blog.
Thanks!
--The WordPress Team
SITE_NAME" ) );
--The Team @ SITE_NAME' ) );
$url = get_blogaddress_by_id($blog_id);
$user = new WP_User($user_id);