Changeset 12948 for trunk/wp-login.php

Timestamp:

02/04/2010 06:57:32 PM (17 years ago)

Author:

ryan

Message:

ms-functions pruning and cleanup. Props nacin. see #11644

File:

• trunk/wp-login.php (modified) (2 diffs)

trunk/wp-login.php

@@ -196 +196 @@
                 $message .= 'http://' . trailingslashit( $current_site->domain . $current_site->path ) . "wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login) . "\r\n";
 
-        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
-        // we want to reverse this for the plain text arena of emails.
-        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-
-        $title = sprintf(__('[%s] Password Reset'), $blogname);
+        if ( is_multisite() )
+                $blogname = $GLOBALS['current_site']->site_name;
+        else
+                // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+                // we want to reverse this for the plain text arena of emails.
+                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+
+        $title = sprintf( __('[%s] Password Reset'), $blogname );
 
         $title = apply_filters('retrieve_password_title', $title);
@@ -245 +248 @@
         $message .= site_url('wp-login.php', 'login') . "\r\n";
 
-        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
-        // we want to reverse this for the plain text arena of emails.
-        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-
-        $title = sprintf(__('[%s] Your new password'), $blogname);
+        if ( is_multisite() )
+                $blogname = $GLOBALS['current_site']->site_name;
+        else
+                // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+                // we want to reverse this for the plain text arena of emails.
+                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+
+        $title = sprintf( __('[%s] Your new password'), $blogname );
 
         $title = apply_filters('password_reset_title', $title);