<!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 = '&lt;div class=&quot;updated&quot; id=&quot;message&quot;&gt;&lt;p&gt;' . $msg . '&lt;/p&gt;&lt;/div&gt;';
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'list';
</del><ins>+$wp_list_table-&gt;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' );
+?&gt;
</ins><span class="cx"> 
</span><del>-        // List sites
-        case 'list':
-        default:
-                $wp_list_table-&gt;prepare_items();
</del><ins>+&lt;div class=&quot;wrap&quot;&gt;
+&lt;?php screen_icon('ms-admin'); ?&gt;
+&lt;h2&gt;&lt;?php _e('Sites') ?&gt;
+&lt;?php echo $msg; ?&gt;
+&lt;a href=&quot;&lt;?php echo network_admin_url('site-new.php'); ?&gt;&quot; class=&quot;button add-new-h2&quot;&gt;&lt;?php echo esc_html_x( 'Add New', 'sites' ); ?&gt;&lt;/a&gt;
+&lt;?php if ( isset( $_REQUEST['s'] ) &amp;&amp; $_REQUEST['s'] ) {
+        printf( '&lt;span class=&quot;subtitle&quot;&gt;' . __( 'Search results for &amp;#8220;%s&amp;#8221;' ) . '&lt;/span&gt;', esc_html( $s ) );
+} ?&gt;
+&lt;/h2&gt;
</ins><span class="cx"> 
</span><del>-                require_once( '../admin-header.php' );
-                ?&gt;
</del><ins>+&lt;form action=&quot;&quot; method=&quot;get&quot; id=&quot;ms-search&quot;&gt;
+&lt;p class=&quot;search-box&quot;&gt;
+&lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;blogs&quot; /&gt;
+&lt;input type=&quot;text&quot; name=&quot;s&quot; value=&quot;&lt;?php echo esc_attr( $s ); ?&gt;&quot; /&gt;
+&lt;input type=&quot;submit&quot; class=&quot;button&quot; value=&quot;&lt;?php esc_attr_e( 'Search Site by' ) ?&gt;&quot; /&gt;
+&lt;select name=&quot;searchaction&quot;&gt;
+        &lt;option value=&quot;name&quot; selected=&quot;selected&quot;&gt;&lt;?php _e( 'Name' ); ?&gt;&lt;/option&gt;
+        &lt;option value=&quot;id&quot;&gt;&lt;?php _e( 'ID' ); ?&gt;&lt;/option&gt;
+        &lt;option value=&quot;ip&quot;&gt;&lt;?php _e( 'IP address' ); ?&gt;&lt;/option&gt;
+&lt;/select&gt;
+&lt;/p&gt;
+&lt;/form&gt;
</ins><span class="cx"> 
</span><del>-                &lt;div class=&quot;wrap&quot;&gt;
-                &lt;?php screen_icon('ms-admin'); ?&gt;
-                &lt;h2&gt;&lt;?php _e('Sites') ?&gt;
-                &lt;?php echo $msg; ?&gt;
-                &lt;a href=&quot;&lt;?php echo network_admin_url('site-new.php'); ?&gt;&quot; class=&quot;button add-new-h2&quot;&gt;&lt;?php echo esc_html_x( 'Add New', 'sites' ); ?&gt;&lt;/a&gt;
-                &lt;?php if ( isset( $_REQUEST['s'] ) &amp;&amp; $_REQUEST['s'] ) {
-                        printf( '&lt;span class=&quot;subtitle&quot;&gt;' . __( 'Search results for &amp;#8220;%s&amp;#8221;' ) . '&lt;/span&gt;', esc_html( $s ) );
-                } ?&gt;
-                &lt;/h2&gt;
</del><ins>+&lt;form id=&quot;form-site-list&quot; action=&quot;edit.php?action=allblogs&quot; method=&quot;post&quot;&gt;
+        &lt;?php $wp_list_table-&gt;display(); ?&gt;
+&lt;/form&gt;
+&lt;/div&gt;
+&lt;?php
</ins><span class="cx"> 
</span><del>-                &lt;form action=&quot;&quot; method=&quot;get&quot; id=&quot;ms-search&quot;&gt;
-                &lt;p class=&quot;search-box&quot;&gt;
-                &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;blogs&quot; /&gt;
-                &lt;input type=&quot;text&quot; name=&quot;s&quot; value=&quot;&lt;?php echo esc_attr( $s ); ?&gt;&quot; /&gt;
-                &lt;input type=&quot;submit&quot; class=&quot;button&quot; value=&quot;&lt;?php esc_attr_e( 'Search Site by' ) ?&gt;&quot; /&gt;
-                &lt;select name=&quot;searchaction&quot;&gt;
-                        &lt;option value=&quot;name&quot; selected=&quot;selected&quot;&gt;&lt;?php _e( 'Name' ); ?&gt;&lt;/option&gt;
-                        &lt;option value=&quot;id&quot;&gt;&lt;?php _e( 'ID' ); ?&gt;&lt;/option&gt;
-                        &lt;option value=&quot;ip&quot;&gt;&lt;?php _e( 'IP address' ); ?&gt;&lt;/option&gt;
-                &lt;/select&gt;
-                &lt;/p&gt;
-                &lt;/form&gt;
-
-                &lt;form id=&quot;form-site-list&quot; action=&quot;edit.php?action=allblogs&quot; method=&quot;post&quot;&gt;
-                        &lt;?php $wp_list_table-&gt;display(); ?&gt;
-                &lt;/form&gt;
-                &lt;/div&gt;
-                &lt;?php
-        break;
-} // end switch( $action )
-
</del><span class="cx"> require_once( '../admin-footer.php' ); ?&gt;
</span></span></pre>
</div>
</div>

</body>
</html>