<!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>[12725] trunk/wp-admin: change ms-blogs.php refs to ms-sites.php,
remove extraneous character, See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12725">12725</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-14 19:42:55 +0000 (Thu, 14 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>change ms-blogs.php refs to ms-sites.php, remove extraneous character, See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (12724 => 12725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-01-14 19:15:00 UTC (rev 12724)
+++ trunk/wp-admin/ms-admin.php 2010-01-14 19:42:55 UTC (rev 12725)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> <h2><?php echo wp_specialchars( $title ); ?></h2>
</span><span class="cx">
</span><span class="cx"> <ul class="subsubsub">
</span><del>- <li><a href="ms-blogs.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li>
</del><ins>+ <li><a href="ms-sites.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li>
</ins><span class="cx"> <li><a href="ms-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li>
</span><span class="cx"> </ul>
</span><span class="cx"> <br clear='all' />
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span><del>- <form name="searchform" action="ms-blogs.php" method="get">
</del><ins>+ <form name="searchform" action="ms-sites.php" method="get">
</ins><span class="cx"> <p>
</span><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="" size="17" />
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (12724 => 12725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-01-14 19:15:00 UTC (rev 12724)
+++ trunk/wp-admin/ms-edit.php 2010-01-14 19:42:55 UTC (rev 12725)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> case "updateblog":
</span><span class="cx"> check_admin_referer('editblog');
</span><span class="cx"> if( empty( $_POST ) )
</span><del>- wp_die( __('You probably need to go back to the <a href="ms-blogs.php">blogs page</a>') );
</del><ins>+ wp_die( __('You probably need to go back to the <a href="ms-sites.php">sites page</a>') );
</ins><span class="cx">
</span><span class="cx"> // themes
</span><span class="cx"> if( is_array( $_POST[ 'theme' ] ) ) {
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> }
</span><span class="cx"> do_action( 'wpmu_update_blog_options' );
</span><span class="cx"> restore_current_blog();
</span><del>- wpmu_admin_do_redirect( "ms-blogs.php?action=editblog&updated=true&id=".$id );
</del><ins>+ wpmu_admin_do_redirect( "ms-sites.php?action=editblog&updated=true&id=".$id );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case "deleteblog":
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (12724 => 12725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-01-14 19:15:00 UTC (rev 12724)
+++ trunk/wp-admin/ms-sites.php 2010-01-14 19:42:55 UTC (rev 12725)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> </div></div>
</span><span class="cx">
</span><span class="cx"> <div id="blogedit_blogoptions" class="postbox " >
</span><del>- <h3 class='hndle'><span><?php printf( __('Blog options (%s_options)'), $blog_prefix ); ?></span></h3>
</del><ins>+ <h3 class='hndle'><span><?php printf( __('Blog options (%soptions)'), $blog_prefix ); ?></span></h3>
</ins><span class="cx"> <div class="inside">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <?php
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> <div class="wrap" style="position:relative;">
</span><span class="cx"> <h2><?php _e('Blogs') ?></h2>
</span><span class="cx">
</span><del>- <form action="ms-blogs.php" method="get" id="ms-search">
</del><ins>+ <form action="ms-sites.php" method="get" id="ms-search">
</ins><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo stripslashes( esc_attr( $s, 1 ) ); ?>" size="17" />
</span><span class="cx"> <input type="submit" class="button" name="blog_name" value="<?php esc_attr_e('Search blogs by name') ?>" />
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="col" class="check-column"></th>
</span><span class="cx"> <?php foreach($posts_columns as $column_id => $column_display_name) {
</span><del>- $column_link = "<a href='ms-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
</del><ins>+ $column_link = "<a href='ms-sites.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
</ins><span class="cx"> if( $_GET['sortby'] == $column_id ) {
</span><span class="cx"> $column_link .= $_GET[ 'order' ] == 'DESC' ? 'order=ASC&amp;' : 'order=DESC&amp;';
</span><span class="cx"> }
</span><span class="lines">@@ -472,11 +472,11 @@
</span><span class="cx">
</span><span class="cx"> case 'blogname': ?>
</span><span class="cx"> <td valign="top">
</span><del>- <a href="ms-blogs.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a>
</del><ins>+ <a href="ms-sites.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a>
</ins><span class="cx"> <br/>
</span><span class="cx"> <?php
</span><span class="cx"> $controlActions = array();
</span><del>- $controlActions[] = '<a href="ms-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
</del><ins>+ $controlActions[] = '<a href="ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
</ins><span class="cx"> $controlActions[] = "<a href='{$protocol}{$blog['domain']}{$blog['path']}wp-admin/' class='edit'>" . __('Backend') . '</a>';
</span><span class="cx">
</span><span class="cx"> if( get_blog_status( $blog['blog_id'], "deleted" ) == '1' )
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (12724 => 12725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-01-14 19:15:00 UTC (rev 12724)
+++ trunk/wp-admin/ms-users.php 2010-01-14 19:42:55 UTC (rev 12725)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php if( isset($_GET['s']) && $_GET['s'] != '' ) : ?>
</span><del>- <p><a href="ms-blogs.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p>
</del><ins>+ <p><a href="ms-sites.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -219,11 +219,11 @@
</span><span class="cx"> if( is_array( $blogs ) ) {
</span><span class="cx"> foreach ( (array) $blogs as $key => $val ) {
</span><span class="cx"> $path = ($val->path == '/') ? '' : $val->path;
</span><del>- echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</del><ins>+ echo '<a href="ms-sites.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</ins><span class="cx"> echo ' <small class="row-actions">';
</span><span class="cx">
</span><span class="cx"> // Edit
</span><del>- echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
</del><ins>+ echo '<a href="ms-sites.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
</ins><span class="cx">
</span><span class="cx"> // View
</span><span class="cx"> echo '<a ';
</span></span></pre>
</div>
</div>
</body>
</html>