Changeset 14854

Timestamp:

05/24/2010 08:45:59 PM (15 years ago)

Author:

nacin

Message:

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 #12666.

Location:

trunk

Files:

• wp-admin/ms-options.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/ms-options.php

@@ -51 +51 @@
                     <?php printf( __( 'Registration and support emails will come from this address. An address such as <code>support@%s</code> is recommended.' ), $current_site->domain ); ?>
                 </td>
-            </tr>
-
-            <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>
         </table>

trunk/wp-includes/functions.php

@@ -3830 +3830 @@
 
 /**
- * are global terms enabled
+ * Whether global terms are enabled.
  *
  *
@@ -3843 +3843 @@
 
     static $global_terms = null;
-    if ( is_null( $global_terms ) )
-        $global_terms = (bool) get_site_option( 'global_terms_enabled' );
+    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 );
+    }
     return $global_terms;
 }