Make WordPress Core

Ticket #18304: 18304.patch

File 18304.patch, 1.5 KB (added by johnbillion, 14 years ago)
  • wp-admin/admin-header.php

     
    112112<div id="wphead">
    113113<?php
    114114
     115if ( is_network_admin() or is_user_admin() ) {
     116        $blog_name = esc_html($current_site->site_name);
     117        $blog_name_length = 30;
     118} else {
     119        $blog_name = get_bloginfo('name', 'display');
     120        $blog_name_length = 40;
     121}
     122
     123$blog_name_excerpt = wp_html_excerpt($blog_name, $blog_name_length);
     124if ( $blog_name != $blog_name_excerpt )
     125        $blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
     126$blog_name = $blog_name_excerpt;
     127unset($blog_name_excerpt,$blog_name_length);
     128
    115129if ( is_network_admin() )
    116         $blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
     130        $blog_name = sprintf( __('%s Network Admin'), $blog_name );
    117131elseif ( is_user_admin() )
    118         $blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
    119 else
    120         $blog_name = get_bloginfo('name', 'display');
    121 if ( '' == $blog_name ) {
     132        $blog_name = sprintf( __('%s Global Dashboard'), $blog_name );
     133else if ( '' == $blog_name )
    122134        $blog_name = __( 'Visit Site' );
    123 } else {
    124         $blog_name_excerpt = wp_html_excerpt($blog_name, 40);
    125         if ( $blog_name != $blog_name_excerpt )
    126                 $blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
    127         $blog_name = $blog_name_excerpt;
    128         unset($blog_name_excerpt);
    129 }
     135
    130136$title_class = '';
    131137if ( function_exists('mb_strlen') ) {
    132138        if ( mb_strlen($blog_name, 'UTF-8') > 30 )