Ticket #18304: 18304.patch

wp-admin/admin-header.php

@@ -112 +112 @@
 <div id="wphead">
 <?php
 
+if ( is_network_admin() or is_user_admin() ) {
+        $blog_name = esc_html($current_site->site_name);
+        $blog_name_length = 30;
+} else {
+        $blog_name = get_bloginfo('name', 'display');
+        $blog_name_length = 40;
+}
+
+$blog_name_excerpt = wp_html_excerpt($blog_name, $blog_name_length);
+if ( $blog_name != $blog_name_excerpt )
+        $blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
+$blog_name = $blog_name_excerpt;
+unset($blog_name_excerpt,$blog_name_length);
+
 if ( is_network_admin() )
-        $blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
+        $blog_name = sprintf( __('%s Network Admin'), $blog_name );
 elseif ( is_user_admin() )
-        $blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
-else
-        $blog_name = get_bloginfo('name', 'display');
-if ( '' == $blog_name ) {
+        $blog_name = sprintf( __('%s Global Dashboard'), $blog_name );
+else if ( '' == $blog_name )
         $blog_name = __( 'Visit Site' );
-} else {
-        $blog_name_excerpt = wp_html_excerpt($blog_name, 40);
-        if ( $blog_name != $blog_name_excerpt )
-                $blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
-        $blog_name = $blog_name_excerpt;
-        unset($blog_name_excerpt);
-}
+
 $title_class = '';
 if ( function_exists('mb_strlen') ) {
         if ( mb_strlen($blog_name, 'UTF-8') > 30 )