<!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>[16014] trunk/wp-admin/network/sites.php: Action switch no longer needed.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16014">16014</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-10-27 16:06:40 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Action switch no longer needed. see <a href="http://trac.wordpress.org/ticket/15174">#15174</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (16013 => 16014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2010-10-27 14:10:47 UTC (rev 16013)
+++ trunk/wp-admin/network/sites.php 2010-10-27 16:06:40 UTC (rev 16014)
</span><span class="lines">@@ -80,51 +80,38 @@
</span><span class="cx"> $msg = '<div class="updated" id="message"><p>' . $msg . '</p></div>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'list';
</del><ins>+$wp_list_table->prepare_items();
</ins><span class="cx">
</span><del>-switch ( $action ) {
- // Edit site
- case 'editblog':
- // No longer used.
- break;
</del><ins>+require_once( '../admin-header.php' );
+?>
</ins><span class="cx">
</span><del>- // List sites
- case 'list':
- default:
- $wp_list_table->prepare_items();
</del><ins>+<div class="wrap">
+<?php screen_icon('ms-admin'); ?>
+<h2><?php _e('Sites') ?>
+<?php echo $msg; ?>
+<a href="<?php echo network_admin_url('site-new.php'); ?>" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'sites' ); ?></a>
+<?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
+ printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+} ?>
+</h2>
</ins><span class="cx">
</span><del>- require_once( '../admin-header.php' );
- ?>
</del><ins>+<form action="" method="get" id="ms-search">
+<p class="search-box">
+<input type="hidden" name="action" value="blogs" />
+<input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" />
+<input type="submit" class="button" value="<?php esc_attr_e( 'Search Site by' ) ?>" />
+<select name="searchaction">
+ <option value="name" selected="selected"><?php _e( 'Name' ); ?></option>
+ <option value="id"><?php _e( 'ID' ); ?></option>
+ <option value="ip"><?php _e( 'IP address' ); ?></option>
+</select>
+</p>
+</form>
</ins><span class="cx">
</span><del>- <div class="wrap">
- <?php screen_icon('ms-admin'); ?>
- <h2><?php _e('Sites') ?>
- <?php echo $msg; ?>
- <a href="<?php echo network_admin_url('site-new.php'); ?>" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'sites' ); ?></a>
- <?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
- printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
- } ?>
- </h2>
</del><ins>+<form id="form-site-list" action="edit.php?action=allblogs" method="post">
+ <?php $wp_list_table->display(); ?>
+</form>
+</div>
+<?php
</ins><span class="cx">
</span><del>- <form action="" method="get" id="ms-search">
- <p class="search-box">
- <input type="hidden" name="action" value="blogs" />
- <input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" />
- <input type="submit" class="button" value="<?php esc_attr_e( 'Search Site by' ) ?>" />
- <select name="searchaction">
- <option value="name" selected="selected"><?php _e( 'Name' ); ?></option>
- <option value="id"><?php _e( 'ID' ); ?></option>
- <option value="ip"><?php _e( 'IP address' ); ?></option>
- </select>
- </p>
- </form>
-
- <form id="form-site-list" action="edit.php?action=allblogs" method="post">
- <?php $wp_list_table->display(); ?>
- </form>
- </div>
- <?php
- break;
-} // end switch( $action )
-
</del><span class="cx"> require_once( '../admin-footer.php' ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>