<!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>[13713] trunk/wp-admin: introduce global_terms_enabled site option,
see #12589</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13713">13713</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-03-16 15:31:50 +0000 (Tue, 16 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>introduce global_terms_enabled site option, see <a href="http://trac.wordpress.org/ticket/12589">#12589</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (13712 => 13713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-03-15 22:46:30 UTC (rev 13712)
+++ trunk/wp-admin/includes/schema.php 2010-03-16 15:31:50 UTC (rev 13713)
</span><span class="lines">@@ -709,6 +709,10 @@
</span><span class="cx"> 'upload_space_check_disabled' => '0',
</span><span class="cx"> 'subdomain_install' => intval( $subdomain_install ),
</span><span class="cx"> );
</span><ins>+ if ( is_multisite() )
+ $sitemeta[ 'global_terms_enabled' ] = get_site_option( 'global_terms_enabled', '0' );
+ else
+ $sitemeta[ 'global_terms_enabled' ] = '0';
</ins><span class="cx">
</span><span class="cx"> $insert = '';
</span><span class="cx"> foreach ( $sitemeta as $meta_key => $meta_value ) {
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (13712 => 13713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-03-15 22:46:30 UTC (rev 13712)
+++ trunk/wp-admin/includes/upgrade.php 2010-03-16 15:31:50 UTC (rev 13713)
</span><span class="lines">@@ -1149,6 +1149,9 @@
</span><span class="cx"> $start += 20;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ // 3.0
+ if ( $wp_current_db_version < 13576 )
+ update_site_option( 'global_terms_enabled', '1' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The functions we use to actually do stuff
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (13712 => 13713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-03-15 22:46:30 UTC (rev 13712)
+++ trunk/wp-admin/ms-edit.php 2010-03-16 15:31:50 UTC (rev 13713)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> update_site_option( "dashboard_blog", $dashboard_blog_id );
</span><del>- $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'admin_notice_feed' );
</del><ins>+ $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'admin_notice_feed', 'global_terms_enabled' );
</ins><span class="cx"> $checked_options = array('mu_media_buttons', 'menu_items');
</span><span class="cx"> foreach ( $checked_options as $option_name ) {
</span><span class="cx"> if ( ! isset($_POST[ $option_name ]) )
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (13712 => 13713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-03-15 22:46:30 UTC (rev 13712)
+++ trunk/wp-admin/ms-options.php 2010-03-16 15:31:50 UTC (rev 13713)
</span><span class="lines">@@ -43,6 +43,14 @@
</span><span class="cx"> <?php printf( __( 'Registration and support mails will come from this address. Make it generic like "support@%s"' ), $current_site->domain ); ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><ins>+
+ <tr valign="top">
+ <th scope="row"><?php _e('Global Terms') ?></th>
+ <td>
+ <label><input type='radio' id="global_terms_enabled" name="global_terms_enabled" value='1' <?php checked( get_site_option( 'global_terms_enabled' ), 1 ) ?>/> <?php _e( 'Enabled' ); ?></label><br />
+ <label><input type='radio' id="global_terms_enabled" name="global_terms_enabled" value='0' <?php checked( get_site_option( 'global_terms_enabled' ), 0 ) ?>/> <?php _e( 'Disabled' ); ?></label><br />
+ <?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></td>
+ </tr>
</ins><span class="cx"> </table>
</span><span class="cx"> <h3><?php _e('Dashboard Settings'); ?></h3>
</span><span class="cx"> <table class="form-table">
</span></span></pre>
</div>
</div>
</body>
</html>