diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-22 10:48:39 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-22 10:48:39 +0000 |
| commit | 4e71faf4fa1a98517df1c83be342dd3714f504d2 (patch) | |
| tree | 0e7c7a45d136ac00739eb1dcc3aa23964c2626b6 /wp-includes/wpmu-functions.php | |
| parent | b58719caa0f572f09019c5a349ae42126cc637eb (diff) | |
| download | wordpress-mu-4e71faf4fa1a98517df1c83be342dd3714f504d2.tar.gz wordpress-mu-4e71faf4fa1a98517df1c83be342dd3714f504d2.tar.xz wordpress-mu-4e71faf4fa1a98517df1c83be342dd3714f504d2.zip | |
get_settings -> get_option (fixes #230)
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@853 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/wpmu-functions.php')
| -rw-r--r-- | wp-includes/wpmu-functions.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php index f31129b..abe34e8 100644 --- a/wp-includes/wpmu-functions.php +++ b/wp-includes/wpmu-functions.php @@ -1060,7 +1060,7 @@ function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_emai $admin_email = get_site_option( "admin_email" ); if( $admin_email == '' ) $admin_email = 'support@' . $_SERVER[ 'SERVER_NAME' ]; - $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) . " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n"; + $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) . " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; $message = sprintf(__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s"), $activate_url, "http://{$domain}{$path}"); // TODO: Don't hard code activation link. $subject = sprintf(__('Activate %s'), $domain.$path); @@ -1072,7 +1072,7 @@ function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') { $admin_email = get_site_option( "admin_email" ); if( $admin_email == '' ) $admin_email = 'support@' . $_SERVER[ 'SERVER_NAME' ]; - $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) . " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n"; + $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) . " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; $message = sprintf(__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n"), "http://{$_SERVER[ 'SERVER_NAME' ]}/wp-activate.php?key=$key" ); // TODO: Don't hard code activation link. $subject = sprintf(__('Activate %s'), $user); @@ -1351,7 +1351,7 @@ SITE_NAME" ) ); $admin_email = get_site_option( "admin_email" ); if( $admin_email == '' ) $admin_email = 'support@' . $_SERVER[ 'SERVER_NAME' ]; - $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) . " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n"; + $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) . " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; $message = $welcome_email; if( empty( $current_site->site_name ) ) $current_site->site_name = "WordPress MU"; @@ -1385,7 +1385,7 @@ SITE_NAME" ); $admin_email = get_site_option( "admin_email" ); if( $admin_email == '' ) $admin_email = 'support@' . $_SERVER[ 'SERVER_NAME' ]; - $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) . " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n"; + $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) . " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; $message = $welcome_email; if( empty( $current_site->site_name ) ) $current_site->site_name = "WordPress MU"; |