Changeset 13896

Timestamp:

03/30/2010 07:13:38 PM (15 years ago)

Author:

ryan

Message:

Use get_home_url() and get_admin_url(). Props andreasnrb. see #12736

Location:

trunk/wp-admin

Files:

• includes/ms.php (modified) (1 diff)
• my-sites.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -712 +712 @@
                     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>

trunk/wp-admin/my-sites.php

@@ -69 +69 @@
             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>";