<!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>[14277] trunk/wp-admin: Restore radios for MS site flags,
as the schema supports other values.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14277">14277</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-28 08:15:45 +0000 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore radios for MS site flags, as the schema supports other values. see <a href="http://trac.wordpress.org/ticket/12832">#12832</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 (14276 => 14277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-04-28 07:48:09 UTC (rev 14276)
+++ trunk/wp-admin/ms-edit.php 2010-04-28 08:15:45 UTC (rev 14277)
</span><span class="lines">@@ -248,9 +248,6 @@
</span><span class="cx">
</span><span class="cx"> // update blogs table
</span><span class="cx"> $blog_data = stripslashes_deep( $_POST['blog'] );
</span><del>- $blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
- foreach ( $blog_data_checkboxes as $c )
- $blog_data[ $c ] = ! empty( $_POST['blog'][ $c ] );
</del><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 (14276 => 14277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-04-28 07:48:09 UTC (rev 14276)
+++ trunk/wp-admin/ms-sites.php 2010-04-28 08:15:45 UTC (rev 14277)
</span><span class="lines">@@ -120,24 +120,26 @@
</span><span class="cx"> <th scope="row"><?php _e('Last Updated') ?></th>
</span><span class="cx"> <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" size="40" /></td>
</span><span class="cx"> </tr>
</span><del>- <tr>
- <th scope="row"><?php _e( 'Site Settings' ); ?></th>
- <td>
</del><span class="cx"> <?php
</span><del>- $checked_fields = array( 'public' => __( 'Public' ) );
</del><ins>+ $radio_fields = array( 'public' => __( 'Public' ) );
</ins><span class="cx"> if ( ! $is_main_site ) {
</span><del>- $checked_fields['archived'] = __( 'Archived' );
- $checked_fields['spam'] = __( 'Spam' );
- $checked_fields['deleted'] = __( 'Deleted' );
</del><ins>+ $radio_fields['archived'] = __( 'Archived' );
+ $radio_fields['spam'] = __( 'Spam' );
+ $radio_fields['deleted'] = __( 'Deleted' );
</ins><span class="cx"> }
</span><del>- $checked_fields['mature'] = __( 'Mature' );
- foreach ( $checked_fields as $field_key => $field_label ) {
</del><ins>+ $radio_fields['mature'] = __( 'Mature' );
+ foreach ( $radio_fields as $field_key => $field_label ) {
</ins><span class="cx"> ?>
</span><del>- <input type="checkbox" name="blog[<?php echo $field_key; ?>]" id="blog_<?php echo $field_key; ?>" value="1"<?php checked( $details->$field_key ); ?> />
- <label for="blog_<?php echo $field_key; ?>"><?php echo $field_label; ?></label><br/>
- <?php } ?>
</del><ins>+ <tr>
+ <th scope="row"><?php echo $field_label; ?></th>
+ <td>
+ <input type="radio" name="blog[<?php echo $field_key; ?>]" id="blog_<?php $field_key; ?>_1" value="1"<?php checked( $details->$field_key, 1 ); ?> />
+ <label for="blog_<?php echo $field_key; ?>_1"><?php _e('Yes'); ?></label>
+ <input type="radio" name="blog[<?php echo $field_key; ?>]" id="blog_<?php $field_key; ?>_0" value="0"<?php checked( $details->$field_key, 0 ); ?> />
+ <label for="blog_<?php echo $field_key; ?>"><?php _e('No'); ?></label>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><ins>+ <?php } ?>
</ins><span class="cx"> </table>
</span><span class="cx"> <p class="submit" style="text-align:center;"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Update Options' ) ?>" /></p>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>