Ticket #12736: 12736.1.patch

wp-admin/includes/ms.php

@@ -711 +711 @@
                                 <?php foreach( (array) $all_blogs as $blog ) {
                                         if ( $primary_blog == $blog->userblog_id )
                                                 $found = true;
-                                        ?><option value='<?php echo $blog->userblog_id ?>'<?php if ( $primary_blog == $blog->userblog_id ) echo ' selected="selected"' ?>>http://<?php echo $blog->domain.$blog->path ?></option><?php
+                                        ?><option value='<?php echo $blog->userblog_id ?>'<?php if ( $primary_blog == $blog->userblog_id ) echo ' selected="selected"' ?>><?php echo get_home_url($blog->userblog_id) ?></option><?php
                                 } ?>
                         </select>
                         <?php

wp-admin/my-sites.php

@@ -68 +68 @@
                         $t = $t == 'border-right: 1px solid #ccc;' ? '' : 'border-right: 1px solid #ccc;';
                         echo "<td valign='top' style='$t; width:50%'>";
                         echo "<h3>{$user_blog->blogname}</h3>";
-                        echo "<p>" . apply_filters( "myblogs_blog_actions", "<a href='{$user_blog->siteurl}'>" . __( 'Visit' ) . "</a> | <a href='{$user_blog->siteurl}/wp-admin/'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
+                        echo "<p>" . apply_filters( "myblogs_blog_actions", "<a href='".get_home_url($user_blog->userblog_id)."'>" . __( 'Visit' ) . "</a> | <a href='".get_admin_url($user_blog->userblog_id)."'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
                         echo apply_filters( 'myblogs_options', '', $user_blog );
                         echo "</td>";
                 }