<!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>[15499] trunk/wp-admin/includes/default-list-tables.php:
  Fix remaining links to ms-* files.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15499">15499</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-15 19:12:06 +0000 (Sun, 15 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix remaining links to ms-* files. Includes patch by markmcwilliams. See 14579</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15498 => 15499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php        2010-08-15 11:02:31 UTC (rev 15498)
+++ trunk/wp-admin/includes/default-list-tables.php        2010-08-15 19:12:06 UTC (rev 15499)
</span><span class="lines">@@ -2885,7 +2885,7 @@
</span><span class="cx"> 
</span><span class="cx">                                         case 'blogname': ?&gt;
</span><span class="cx">                                                 &lt;td class=&quot;column-title&quot;&gt;
</span><del>-                                                        &lt;a href=&quot;&lt;?php echo esc_url( admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $blog['blog_id'] ) ); ?&gt;&quot; class=&quot;edit&quot;&gt;&lt;?php echo $blogname . $blog_state; ?&gt;&lt;/a&gt;
</del><ins>+                                                        &lt;a href=&quot;&lt;?php echo esc_url( network_admin_url( 'sites.php?action=editblog&amp;amp;id=' . $blog['blog_id'] ) ); ?&gt;&quot; class=&quot;edit&quot;&gt;&lt;?php echo $blogname . $blog_state; ?&gt;&lt;/a&gt;
</ins><span class="cx">                                                         &lt;?php
</span><span class="cx">                                                         if ( 'list' != $mode )
</span><span class="cx">                                                                 echo '&lt;p&gt;' . sprintf( _x( '%1$s &amp;#8211; &lt;em&gt;%2$s&lt;/em&gt;', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '&lt;/p&gt;';
</span><span class="lines">@@ -2900,25 +2900,25 @@
</span><span class="cx">                                                                 'visit' =&gt; '',
</span><span class="cx">                                                         );
</span><span class="cx"> 
</span><del>-                                                        $actions['edit']        = '&lt;span class=&quot;edit&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $blog['blog_id'] ) ) . '&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                        $actions['edit']        = '&lt;span class=&quot;edit&quot;&gt;&lt;a href=&quot;' . esc_url( network_admin_url( 'sites.php?action=editblog&amp;amp;id=' . $blog['blog_id'] ) ) . '&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                         $actions['backend']        = &quot;&lt;span class='backend'&gt;&lt;a href='&quot; . esc_url( get_admin_url( $blog['blog_id'] ) ) . &quot;' class='edit'&gt;&quot; . __( 'Backend' ) . '&lt;/a&gt;&lt;/span&gt;';
</span><span class="cx">                                                         if ( $current_site-&gt;blog_id != $blog['blog_id'] ) {
</span><span class="cx">                                                                 if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
</span><del>-                                                                        $actions['activate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=activateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['activate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=activateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                 else
</span><del>-                                                                        $actions['deactivate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=deactivateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Deactivate' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['deactivate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=deactivateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Deactivate' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><span class="cx">                                                                 if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
</span><del>-                                                                        $actions['unarchive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=unarchiveblog&amp;amp;id=' .  $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Unarchive' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['unarchive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=unarchiveblog&amp;amp;id=' .  $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Unarchive' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                 else
</span><del>-                                                                        $actions['archive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=archiveblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . _x( 'Archive', 'verb; site' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['archive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=archiveblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . _x( 'Archive', 'verb; site' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><span class="cx">                                                                 if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
</span><del>-                                                                        $actions['unspam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=unspamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . _x( 'Not Spam', 'site' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['unspam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=unspamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . _x( 'Not Spam', 'site' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                 else
</span><del>-                                                                        $actions['spam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=spamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '&quot;&gt;' . _x( 'Spam', 'site' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['spam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=spamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '&quot;&gt;' . _x( 'Spam', 'site' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><del>-                                                                $actions['delete']        = '&lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=deleteblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Delete' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                $actions['delete']        = '&lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;' . esc_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=deleteblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Delete' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                         }
</span><span class="cx"> 
</span><span class="cx">                                                         $actions['visit']        = &quot;&lt;span class='view'&gt;&lt;a href='&quot; . esc_url( get_home_url( $blog['blog_id'] ) ) . &quot;' rel='permalink'&gt;&quot; . __( 'Visit' ) . '&lt;/a&gt;&lt;/span&gt;';
</span><span class="lines">@@ -3167,7 +3167,7 @@
</span><span class="cx">                                                         &lt;div class=&quot;row-actions&quot;&gt;
</span><span class="cx">                                                                 &lt;span class=&quot;edit&quot;&gt;&lt;a href=&quot;&lt;?php echo esc_url( admin_url( $edit_link ) ); ?&gt;&quot;&gt;&lt;?php _e( 'Edit' ); ?&gt;&lt;/a&gt;&lt;/span&gt;
</span><span class="cx">                                                                 &lt;?php if ( ! in_array( $user['user_login'], $super_admins ) ) { ?&gt;
</span><del>-                                                                | &lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;&lt;?php echo $delete        = esc_url( admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'ms-edit.php', 'deleteuser' ) . '&amp;amp;action=deleteuser&amp;amp;id=' . $user['ID'] ) ) ); ?&gt;&quot; class=&quot;delete&quot;&gt;&lt;?php _e( 'Delete' ); ?&gt;&lt;/a&gt;&lt;/span&gt;
</del><ins>+                                                                | &lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;&lt;?php echo $delete        = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;amp;action=deleteuser&amp;amp;id=' . $user['ID'] ) ) ); ?&gt;&quot; class=&quot;delete&quot;&gt;&lt;?php _e( 'Delete' ); ?&gt;&lt;/a&gt;&lt;/span&gt;
</ins><span class="cx">                                                                 &lt;?php } ?&gt;
</span><span class="cx">                                                         &lt;/div&gt;
</span><span class="cx">                                                 &lt;/td&gt;
</span><span class="lines">@@ -3202,11 +3202,11 @@
</span><span class="cx">                                                         if ( is_array( $blogs ) ) {
</span><span class="cx">                                                                 foreach ( (array) $blogs as $key =&gt; $val ) {
</span><span class="cx">                                                                         $path        = ( $val-&gt;path == '/' ) ? '' : $val-&gt;path;
</span><del>-                                                                        echo '&lt;a href=&quot;'. esc_url( admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $val-&gt;userblog_id ) ) .'&quot;&gt;' . str_replace( '.' . $current_site-&gt;domain, '', $val-&gt;domain . $path ) . '&lt;/a&gt;';
</del><ins>+                                                                        echo '&lt;a href=&quot;'. esc_url( network_admin_url( 'sites.php?action=editblog&amp;amp;id=' . $val-&gt;userblog_id ) ) .'&quot;&gt;' . str_replace( '.' . $current_site-&gt;domain, '', $val-&gt;domain . $path ) . '&lt;/a&gt;';
</ins><span class="cx">                                                                         echo ' &lt;small class=&quot;row-actions&quot;&gt;';
</span><span class="cx"> 
</span><span class="cx">                                                                         // Edit
</span><del>-                                                                        echo '&lt;a href=&quot;'. esc_url( admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $val-&gt;userblog_id ) ) .'&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt; | ';
</del><ins>+                                                                        echo '&lt;a href=&quot;'. esc_url( network_admin_url( 'sites.php?action=editblog&amp;amp;id=' . $val-&gt;userblog_id ) ) .'&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt; | ';
</ins><span class="cx"> 
</span><span class="cx">                                                                         // View
</span><span class="cx">                                                                         echo '&lt;a ';
</span></span></pre>
</div>
</div>

</body>
</html>