
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--

#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }

#msg ul, pre { overflow: auto; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<title>[13896] trunk/wp-admin: Use get_home_url() and get_admin_url().</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13896">13896</a></dd>

<dt>Author</dt> <dd>ryan</dd>

<dt>Date</dt> <dd>2010-03-30 19:13:38 +0000 (Tue, 30 Mar 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>Use get_home_url() and get_admin_url(). Props andreasnrb. see <a href="http://trac.wordpress.org/ticket/12736">#12736</a></pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>

<li><a href="#trunkwpadminmysitesphp">trunk/wp-admin/my-sites.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminincludesmsphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13895 => 13896)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/ms.php        2010-03-30 18:55:35 UTC (rev 13895)

+++ trunk/wp-admin/includes/ms.php        2010-03-30 19:13:38 UTC (rev 13896)

</span><span class="lines">@@ -711,7 +711,7 @@

</span><span class="cx">                                 &lt;?php foreach( (array) $all_blogs as $blog ) {

</span><span class="cx">                                         if ( $primary_blog == $blog-&gt;userblog_id )

</span><span class="cx">                                                 $found = true;

</span><del>-                                        ?&gt;&lt;option value='&lt;?php echo $blog-&gt;userblog_id ?&gt;'&lt;?php if ( $primary_blog == $blog-&gt;userblog_id ) echo ' selected=&quot;selected&quot;' ?&gt;&gt;http://&lt;?php echo $blog-&gt;domain.$blog-&gt;path ?&gt;&lt;/option&gt;&lt;?php

</del><ins>+                                        ?&gt;&lt;option value='&lt;?php echo $blog-&gt;userblog_id ?&gt;'&lt;?php if ( $primary_blog == $blog-&gt;userblog_id ) echo ' selected=&quot;selected&quot;' ?&gt;&gt;&lt;?php echo get_home_url($blog-&gt;userblog_id) ?&gt;&lt;/option&gt;&lt;?php

</ins><span class="cx">                                 } ?&gt;

</span><span class="cx">                         &lt;/select&gt;

</span><span class="cx">                         &lt;?php

</span></span></pre></div>

<a id="trunkwpadminmysitesphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/my-sites.php (13895 => 13896)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/my-sites.php        2010-03-30 18:55:35 UTC (rev 13895)

+++ trunk/wp-admin/my-sites.php        2010-03-30 19:13:38 UTC (rev 13896)

</span><span class="lines">@@ -68,7 +68,7 @@

</span><span class="cx">                         $t = $t == 'border-right: 1px solid #ccc;' ? '' : 'border-right: 1px solid #ccc;';

</span><span class="cx">                         echo &quot;&lt;td valign='top' style='$t; width:50%'&gt;&quot;;

</span><span class="cx">                         echo &quot;&lt;h3&gt;{$user_blog-&gt;blogname}&lt;/h3&gt;&quot;;

</span><del>-                        echo &quot;&lt;p&gt;&quot; . apply_filters( &quot;myblogs_blog_actions&quot;, &quot;&lt;a href='{$user_blog-&gt;siteurl}'&gt;&quot; . __( 'Visit' ) . &quot;&lt;/a&gt; | &lt;a href='{$user_blog-&gt;siteurl}/wp-admin/'&gt;&quot; . __( 'Dashboard' ) . &quot;&lt;/a&gt;&quot;, $user_blog ) . &quot;&lt;/p&gt;&quot;;

</del><ins>+                        echo &quot;&lt;p&gt;&quot; . apply_filters( &quot;myblogs_blog_actions&quot;, &quot;&lt;a href='&quot; . get_home_url($user_blog-&gt;userblog_id) . &quot;'&gt;&quot; . __( 'Visit' ) . &quot;&lt;/a&gt; | &lt;a href='&quot; . get_admin_url($user_blog-&gt;userblog_id) . &quot;'&gt;&quot; . __( 'Dashboard' ) . &quot;&lt;/a&gt;&quot;, $user_blog ) . &quot;&lt;/p&gt;&quot;;

</ins><span class="cx">                         echo apply_filters( 'myblogs_options', '', $user_blog );

</span><span class="cx">                         echo &quot;&lt;/td&gt;&quot;;

</span><span class="cx">                 }

</span></span></pre>

</div>

</div>


</body>

</html>