<!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>[14854] trunk: Even better, remove all UI for global terms.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14854">14854</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-24 20:45:59 +0000 (Mon, 24 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Even better, remove all UI for global terms. Add a filter to global_terms_enabled() and also allow the site option to simply be deleted. fixes <a href="http://trac.wordpress.org/ticket/12666">#12666</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (14853 => 14854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-05-24 19:54:46 UTC (rev 14853)
+++ trunk/wp-admin/ms-options.php 2010-05-24 20:45:59 UTC (rev 14854)
</span><span class="lines">@@ -51,16 +51,6 @@
</span><span class="cx"> <?php printf( __( 'Registration and support emails will come from this address. An address such as <code>support@%s</code> is recommended.' ), $current_site->domain ); ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><del>-
- <tr valign="top">
- <th scope="row"><?php _e( 'Global Terms' ) ?></th>
- <td>
- <label><input type="radio" name="global_terms_enabled" value="0"<?php checked( global_terms_enabled(), false ) ?>/> <?php _e( 'Disabled' ); ?></label><br/>
- <label><input type="radio" name="global_terms_enabled" value="1"<?php checked( global_terms_enabled(), true ) ?>/> <?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></label><br />
- <?php if ( ! get_site_option( 'global_terms_enabled') ) { ?>
- <strong><?php _e( 'Warning!' ); ?></strong> <?php _e( 'Enabling global terms will create a new table and synchronize terms across the network.' ); ?>
- <?php } ?></td>
- </tr>
</del><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>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (14853 => 14854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-05-24 19:54:46 UTC (rev 14853)
+++ trunk/wp-includes/functions.php 2010-05-24 20:45:59 UTC (rev 14854)
</span><span class="lines">@@ -3829,7 +3829,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * are global terms enabled
</del><ins>+ * Whether global terms are enabled.
</ins><span class="cx"> *
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="lines">@@ -3842,8 +3842,13 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> static $global_terms = null;
</span><del>- if ( is_null( $global_terms ) )
- $global_terms = (bool) get_site_option( 'global_terms_enabled' );
</del><ins>+ if ( is_null( $global_terms ) ) {
+ $filter = apply_filters( 'global_terms_enabled', null );
+ if ( ! is_null( $filter ) )
+ $global_terms = (bool) $filter;
+ else
+ $global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+ }
</ins><span class="cx"> return $global_terms;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>