Changeset 13106 for trunk/wp-includes/ms-functions.php

Timestamp:

02/13/2010 10:35:10 AM (15 years ago)

Author:

nacin

Message:

Don't use deprecated functions. see #11388

File:

• trunk/wp-includes/ms-functions.php (modified) (5 diffs)

trunk/wp-includes/ms-functions.php

@@ -868 +868 @@
     if ( isset( $_GET['redirect'] ) ) {
         if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
-            $url .= "&action=blogs&s=". wp_specialchars( substr( $_GET['redirect'], 2 ) );
+            $url .= "&action=blogs&s=". esc_html( substr( $_GET['redirect'], 2 ) );
     } elseif ( isset( $_POST['redirect'] ) ) {
         $url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
@@ -1156 +1156 @@
     if ( $admin_email == '' )
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-    $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+    $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
     $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "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, esc_url( "http://{$domain}{$path}" ), $key );
@@ -1175 +1175 @@
     if ( $admin_email == '' )
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-    $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+    $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
     $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "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" ) ), site_url( "wp-activate.php?key=$key" ), $key );
@@ -1479 +1479 @@
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-    $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+    $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
     $message = $welcome_email;
@@ -1512 +1512 @@
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-    $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+    $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
     $message = $welcome_email;