WordPress.org

Make WordPress Core

Changeset 12948 for trunk/wp-login.php


Ignore:
Timestamp:
02/04/2010 06:57:32 PM (10 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-login.php

    r12859 r12948  
    196196            $message .= 'http://' . trailingslashit( $current_site->domain . $current_site->path ) . "wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login) . "\r\n";
    197197
    198     // The blogname option is escaped with esc_html on the way into the database in sanitize_option
    199     // we want to reverse this for the plain text arena of emails.
    200     $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
    201 
    202     $title = sprintf(__('[%s] Password Reset'), $blogname);
     198    if ( is_multisite() )
     199        $blogname = $GLOBALS['current_site']->site_name;
     200    else
     201        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
     202        // we want to reverse this for the plain text arena of emails.
     203        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
     204
     205    $title = sprintf( __('[%s] Password Reset'), $blogname );
    203206
    204207    $title = apply_filters('retrieve_password_title', $title);
     
    245248    $message .= site_url('wp-login.php', 'login') . "\r\n";
    246249
    247     // The blogname option is escaped with esc_html on the way into the database in sanitize_option
    248     // we want to reverse this for the plain text arena of emails.
    249     $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
    250 
    251     $title = sprintf(__('[%s] Your new password'), $blogname);
     250    if ( is_multisite() )
     251        $blogname = $GLOBALS['current_site']->site_name;
     252    else
     253        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
     254        // we want to reverse this for the plain text arena of emails.
     255        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
     256
     257    $title = sprintf( __('[%s] Your new password'), $blogname );
    252258
    253259    $title = apply_filters('password_reset_title', $title);
Note: See TracChangeset for help on using the changeset viewer.