' .
'' . __( 'Name - The name is how it appears on your site.' ) . ' ';
- if ( ! global_terms_enabled() )
- $help .= '' . __( 'Slug - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . ' ';
+ $help .= '' . __( 'Slug - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . ' ';
if ( 'category' == $taxonomy )
$help .= '' . __( 'Parent - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . ' ';
@@ -361,13 +360,11 @@ if ( current_user_can($tax->cap->edit_terms) ) {
-
-
-
slug = sanitize_title( $term->name );
- } else {
- $term['slug'] = sanitize_title( $term['name'] );
- }
- }
- return $term;
-}
-add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
-
function _access_denied_splash() {
if ( ! is_user_logged_in() || is_network_admin() )
return;
diff --git wp-admin/includes/schema.php wp-admin/includes/schema.php
index f5309a3..60c4449 100644
--- wp-admin/includes/schema.php
+++ wp-admin/includes/schema.php
@@ -898,7 +898,6 @@ We hope you enjoy your new site. Thanks!
'add_new_users' => '0',
'upload_space_check_disabled' => '0',
'subdomain_install' => intval( $subdomain_install ),
- 'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
'initial_db_version' => get_option( 'initial_db_version' ),
'active_sitewide_plugins' => array(),
);
diff --git wp-admin/includes/upgrade.php wp-admin/includes/upgrade.php
index d71163e..98c0029 100644
--- wp-admin/includes/upgrade.php
+++ wp-admin/includes/upgrade.php
@@ -108,16 +108,7 @@ function wp_install_defaults($user_id) {
/* translators: Default category slug */
$cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
- if ( global_terms_enabled() ) {
- $cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
- if ( $cat_id == null ) {
- $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
- $cat_id = $wpdb->insert_id;
- }
- update_option('default_category', $cat_id);
- } else {
- $cat_id = 1;
- }
+ $cat_id = 1;
$wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
@@ -1234,10 +1225,6 @@ function upgrade_network() {
}
}
- // 3.0
- if ( $wp_current_db_version < 13576 )
- update_site_option( 'global_terms_enabled', '1' );
-
// 3.3
if ( $wp_current_db_version < 19390 )
update_site_option( 'initial_db_version', $wp_current_db_version );
@@ -1960,27 +1947,3 @@ function pre_schema_upgrade() {
}
-/**
- * Install global terms.
- *
- * @since 3.0.0
- *
- */
-if ( !function_exists( 'install_global_terms' ) ) :
-function install_global_terms() {
- global $wpdb, $charset_collate;
- $ms_queries = "
-CREATE TABLE $wpdb->sitecategories (
- cat_ID bigint(20) NOT NULL auto_increment,
- cat_name varchar(55) NOT NULL default '',
- category_nicename varchar(200) NOT NULL default '',
- last_updated timestamp NOT NULL,
- PRIMARY KEY (cat_ID),
- KEY category_nicename (category_nicename),
- KEY last_updated (last_updated)
-) $charset_collate;
-";
-// now create tables
- dbDelta( $ms_queries );
-}
-endif;
diff --git wp-admin/network/settings.php wp-admin/network/settings.php
index e75d95f..37e9b94 100644
--- wp-admin/network/settings.php
+++ wp-admin/network/settings.php
@@ -85,7 +85,7 @@ if ( $_POST ) {
update_site_option( 'banned_email_domains', '' );
}
- $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', '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', 'global_terms_enabled' );
+ $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', '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' );
$checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
foreach ( $checked_options as $option_name => $option_unchecked_value ) {
if ( ! isset( $_POST[$option_name] ) )
diff --git wp-includes/functions.php wp-includes/functions.php
index 242b055..3368c2e 100644
--- wp-includes/functions.php
+++ wp-includes/functions.php
@@ -1799,7 +1799,7 @@ function wp_get_mime_types() {
'mid|midi' => 'audio/midi',
'wma' => 'audio/wma',
'mka' => 'audio/x-matroska',
- // Misc application formats
+ // Misc application formats
'rtf' => 'application/rtf',
'js' => 'application/javascript',
'pdf' => 'application/pdf',
@@ -1857,7 +1857,7 @@ function wp_get_mime_types() {
*
* @uses apply_filters() Calls 'upload_mimes' on returned array
* @uses wp_get_upload_mime_types() to fetch the list of mime types
- *
+ *
* @return array Array of mime types keyed by the file extension regex corresponding to those types.
*/
function get_allowed_mime_types() {
@@ -3009,30 +3009,6 @@ function is_main_site( $blog_id = '' ) {
}
/**
- * Whether global terms are enabled.
- *
- *
- * @since 3.0.0
- * @package WordPress
- *
- * @return bool True if multisite and global terms enabled
- */
-function global_terms_enabled() {
- if ( ! is_multisite() )
- return false;
-
- static $global_terms = null;
- 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;
-}
-
-/**
* gmt_offset modification for smart timezone handling.
*
* Overrides the gmt_offset option if we have a timezone_string available.
diff --git wp-includes/ms-default-filters.php wp-includes/ms-default-filters.php
index 4541014..34716d8 100644
--- wp-includes/ms-default-filters.php
+++ wp-includes/ms-default-filters.php
@@ -33,7 +33,6 @@ add_action( 'template_redirect', 'maybe_redirect_404' );
add_filter( 'allowed_redirect_hosts', 'redirect_this_site' );
// Administration
-add_filter( 'term_id_filter', 'global_terms', 10, 2 );
add_action( 'publish_post', 'update_posts_count' );
add_action( 'delete_post', '_update_blog_date_on_post_delete' );
add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 );
diff --git wp-includes/ms-functions.php wp-includes/ms-functions.php
index 202c3ab..cfdd19a 100644
--- wp-includes/ms-functions.php
+++ wp-includes/ms-functions.php
@@ -1513,74 +1513,6 @@ function wpmu_log_new_registrations( $blog_id, $user_id ) {
}
/**
- * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.
- *
- * @since 3.0.0
- *
- * @see term_id_filter
- *
- * @param int $term_id An ID for a term on the current blog.
- * @return int An ID from the global terms table mapped from $term_id.
- */
-function global_terms( $term_id, $deprecated = '' ) {
- global $wpdb;
- static $global_terms_recurse = null;
-
- if ( !global_terms_enabled() )
- return $term_id;
-
- // prevent a race condition
- $recurse_start = false;
- if ( $global_terms_recurse === null ) {
- $recurse_start = true;
- $global_terms_recurse = 1;
- } elseif ( 10 < $global_terms_recurse++ ) {
- return $term_id;
- }
-
- $term_id = intval( $term_id );
- $c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
-
- $global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
- if ( $global_id == null ) {
- $used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
- if ( null == $used_global_id ) {
- $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
- $global_id = $wpdb->insert_id;
- if ( empty( $global_id ) )
- return $term_id;
- } else {
- $max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
- $max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
- $new_global_id = max( $max_global_id, $max_local_id ) + mt_rand( 100, 400 );
- $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
- $global_id = $wpdb->insert_id;
- }
- } elseif ( $global_id != $term_id ) {
- $local_id = $wpdb->get_row( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
- if ( null != $local_id )
- $local_id = global_terms( $local_id );
- if ( 10 < $global_terms_recurse )
- $global_id = $term_id;
- }
-
- if ( $global_id != $term_id ) {
- if ( get_option( 'default_category' ) == $term_id )
- update_option( 'default_category', $global_id );
-
- $wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
- $wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
- $wpdb->update( $wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id) );
-
- clean_term_cache($term_id);
- }
- if( $recurse_start )
- $global_terms_recurse = null;
-
- return $global_id;
-}
-
-/**
* Ensure that the current site's domain is listed in the allowed redirect host list.
*
* @see wp_validate_redirect()
diff --git wp-includes/option.php wp-includes/option.php
index 33897b6..00c2cf1 100644
--- wp-includes/option.php
+++ wp-includes/option.php
@@ -174,7 +174,7 @@ function wp_load_core_site_options( $site_id = null ) {
if ( empty($site_id) )
$site_id = $wpdb->siteid;
- $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled' );
+ $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts');
$core_options_in = "'" . implode("', '", $core_options) . "'";
$options = $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id) );