<!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>[14102] trunk/wp-admin: Fix the blog settings checkboxes on ms-sites.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14102">14102</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-16 13:35:44 +0000 (Fri, 16 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the blog settings checkboxes on ms-sites.php. fixes <a href="http://trac.wordpress.org/ticket/12889">#12889</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (14101 => 14102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-04-16 13:15:39 UTC (rev 14101)
+++ trunk/wp-admin/ms-edit.php 2010-04-16 13:35:44 UTC (rev 14102)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-if ( !is_multisite() )
</del><ins>+if ( ! is_multisite() )
</ins><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><span class="cx"> if ( empty( $_GET['action'] ) )
</span><span class="lines">@@ -248,6 +248,9 @@
</span><span class="cx">
</span><span class="cx"> // update blogs table
</span><span class="cx"> $blog_data = stripslashes_deep( $_POST['blog'] );
</span><ins>+ $blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
+ foreach ( $blog_data_checkboxes as $c )
+ $blog_data[ $c ] = ! empty( $_POST['blog'][ $c ] );
</ins><span class="cx"> update_blog_details( $id, $blog_data );
</span><span class="cx">
</span><span class="cx"> // get blog prefix
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (14101 => 14102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-04-16 13:15:39 UTC (rev 14101)
+++ trunk/wp-admin/ms-sites.php 2010-04-16 13:35:44 UTC (rev 14102)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-if ( !is_multisite() )
</del><ins>+if ( ! is_multisite() )
</ins><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can( 'manage_sites' ) )
</span><span class="lines">@@ -124,11 +124,9 @@
</span><span class="cx"> <th scope="row"><?php _e( 'Site Settings' ); ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <?php
</span><del>- if ( $is_main_site )
- $checked_fields = array( 'public' => __( 'Public' ) );
- else
</del><ins>+ $checked_fields = array( 'public' => __( 'Public' ) );
+ if ( ! $is_main_site )
</ins><span class="cx"> $checked_fields = array(
</span><del>- 'public' => __( 'Public' ),
</del><span class="cx"> 'archived' => __( 'Archived' ),
</span><span class="cx"> 'spam' => __( 'Spam' ),
</span><span class="cx"> 'deleted' => __( 'Deleted' ),
</span><span class="lines">@@ -136,7 +134,7 @@
</span><span class="cx"> $checked_fields['mature'] = __( 'Mature' );
</span><span class="cx"> foreach ( $checked_fields as $field_key => $field_label ) {
</span><span class="cx"> ?>
</span><del>- <input type="checkbox" name="blog[<?php echo $field_key; ?>]" id="blog_<?php echo $field_key; ?>" value="<?php echo $details->$field_key; ?>"<?php checked( $details->$field_key ); ?> />
</del><ins>+ <input type="checkbox" name="blog[<?php echo $field_key; ?>]" id="blog_<?php echo $field_key; ?>" value="1"<?php checked( $details->$field_key ); ?> />
</ins><span class="cx"> <label for="blog_<?php echo $field_key; ?>"><?php echo $field_label; ?></label><br/>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </td>
</span></span></pre>
</div>
</div>
</body>
</html>