Changeset 54240

Timestamp:

09/20/2022 02:49:25 AM (23 months ago)

Author:

desrosj

Message:

Networks and Sites: Officially remove global terms.

Global terms was a feature from the WordPress MU days where multisite and single site installs used different code bases.

In WordPress 3.0, WordPress MU was merged into one location and the UI [14854] and “on” switch [14880] for global terms were completely removed.

Even before this merge, global terms was bug infested and unreliable. After [14854]/[14880], the feature was no longer maintained and became increasingly broken as taxonomies progressed without it (term splitting and term meta do not work at all). At this point, the feature has not worked in 12+ years and there’s no hope for saving it.

This deprecates the remaining global terms related code and no-ops the functions.

Global terms, you don’t have to go home, but you can’t stay here.

Props scribu, wonderboymusic, SergeyBiryukov, nacin, pento, desrosj, johnjamesjacoby, johnbillion, dd32.
Fixes #21734.

Location:

trunk

Files:

• src/wp-admin/edit-tag-form.php (modified) (2 diffs)
• src/wp-admin/edit-tags.php (modified) (3 diffs)
• src/wp-admin/includes/class-wp-terms-list-table.php (modified) (1 diff)
• src/wp-admin/includes/ms-admin-filters.php (modified) (1 diff)
• src/wp-admin/includes/ms-deprecated.php (modified) (1 diff)
• src/wp-admin/includes/ms.php (modified) (1 diff)
• src/wp-admin/includes/schema.php (modified) (1 diff)
• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• src/wp-admin/network/settings.php (modified) (1 diff)
• src/wp-includes/class-wpdb.php (modified) (4 diffs)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/ms-default-filters.php (modified) (1 diff)
• src/wp-includes/ms-deprecated.php (modified) (1 diff)
• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/pluggable.php (modified) (2 diffs)

trunk/src/wp-admin/edit-tag-form.php

@@ -149 +149 @@
             <p class="description" id="name-description"><?php echo $tax->labels->name_field_description; ?></p></td>
         </tr>
-<?php if ( ! global_terms_enabled() ) { ?>
         <tr class="form-field term-slug-wrap">
             <th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
@@ -171 +170 @@
             <p class="description" id="slug-description"><?php echo $tax->labels->slug_field_description; ?></p></td>
         </tr>
-<?php } ?>
 <?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?>
         <tr class="form-field term-parent-wrap">

trunk/src/wp-admin/edit-tags.php

@@ -281 +281 @@
         '<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';
 
-        if ( ! global_terms_enabled() ) {
-            $help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
-        }
+        $help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
 
         if ( 'category' === $taxonomy ) {
@@ -457 +455 @@
     <p id="name-description"><?php echo $tax->labels->name_field_description; ?></p>
 </div>
-    <?php if ( ! global_terms_enabled() ) : ?>
 <div class="form-field term-slug-wrap">
     <label for="tag-slug"><?php _e( 'Slug' ); ?></label>
@@ -463 +460 @@
     <p id="slug-description"><?php echo $tax->labels->slug_field_description; ?></p>
 </div>
-<?php endif; // global_terms_enabled() ?>
     <?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?>
 <div class="form-field term-parent-wrap">

trunk/src/wp-admin/includes/class-wp-terms-list-table.php

@@ -666 +666 @@
                 </label>
 
-                <?php if ( ! global_terms_enabled() ) : ?>
-                    <label>
-                        <span class="title"><?php _e( 'Slug' ); ?></span>
-                        <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
-                    </label>
-                <?php endif; ?>
+                <label>
+                    <span class="title"><?php _e( 'Slug' ); ?></span>
+                    <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
+                </label>
                 </div>
             </fieldset>

trunk/src/wp-admin/includes/ms-admin-filters.php

@@ -23 +23 @@
 add_action( 'update_site_option_admin_email', 'wp_network_admin_email_change_notification', 10, 4 );
 
-// Taxonomy hooks.
-add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
-
 // Post hooks.
 add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 );

trunk/src/wp-admin/includes/ms-deprecated.php

@@ -109 +109 @@
  */
 function ms_deprecated_blogs_file() {}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-admin/includes/ms.php

@@ -545 +545 @@
 
 /**
- * Synchronizes category and post tag slugs when global terms are enabled.
- *
- * @since 3.0.0
- *
- * @param WP_Term|array $term     The term.
- * @param string        $taxonomy The taxonomy for `$term`. Should be 'category' or 'post_tag', as these are
- *                                the only taxonomies which are processed by this function; anything else
- *                                will be returned untouched.
- * @return WP_Term|array Returns `$term`, after filtering the 'slug' field with `sanitize_title()`
- *                       if `$taxonomy` is 'category' or 'post_tag'.
- */
-function sync_category_tag_slugs( $term, $taxonomy ) {
-    if ( global_terms_enabled() && ( 'category' === $taxonomy || 'post_tag' === $taxonomy ) ) {
-        if ( is_object( $term ) ) {
-            $term->slug = sanitize_title( $term->name );
-        } else {
-            $term['slug'] = sanitize_title( $term['name'] );
-        }
-    }
-    return $term;
-}
-
-/**
  * Displays an access denied message when a user tries to view a site's dashboard they
  * do not have access to.

trunk/src/wp-admin/includes/schema.php

@@ -1271 +1271 @@
         'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
         'subdomain_install'           => $subdomain_install,
-        'global_terms_enabled'        => global_terms_enabled() ? '1' : '0',
         'ms_files_rewriting'          => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
         'user_count'                  => get_site_option( 'user_count' ),

trunk/src/wp-admin/includes/upgrade.php

@@ -160 +160 @@
         $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 ( null == $cat_id ) {
-                $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(
@@ -3538 +3521 @@
 }
 
-if ( ! function_exists( 'install_global_terms' ) ) :
-    /**
-     * Install global terms.
-     *
-     * @since 3.0.0
-     *
-     * @global wpdb   $wpdb            WordPress database abstraction object.
-     * @global string $charset_collate
-     */
-    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;
-
 /**
  * Determine if global tables should be upgraded.

trunk/src/wp-admin/network/settings.php

@@ -101 +101 @@
         'welcome_user_email',
         'fileupload_maxk',
-        'global_terms_enabled',
         'illegal_names',
         'limited_email_domains',

trunk/src/wp-includes/class-wpdb.php

@@ -341 +341 @@
         'site',
         'sitemeta',
-        'sitecategories',
         'registration_log',
     );
+
+
+
+
+
+
+
+
+
+
 
     /**
@@ -1124 +1133 @@
      *
      * @since 3.0.0
+
      *
      * @uses wpdb::$tables
@@ -1129 +1139 @@
      * @uses wpdb::$global_tables
      * @uses wpdb::$ms_global_tables
+
      *
      * @param string $scope   Optional. Possible values include 'all', 'global', 'ms_global', 'blog',
@@ -1160 +1171 @@
             case 'old':
                 $tables = $this->old_tables;
+
+
+
                 break;
             default:

trunk/src/wp-includes/functions.php

@@ -6221 +6221 @@
 
 /**
- * Determines whether global terms are enabled.
- *
- * @since 3.0.0
- *
- * @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 ) ) {
-
-        /**
-         * Filters whether global terms are enabled.
-         *
-         * Returning a non-null value from the filter will effectively short-circuit the function
-         * and return the value of the 'global_terms_enabled' site option instead.
-         *
-         * @since 3.0.0
-         *
-         * @param null $enabled Whether global terms are enabled.
-         */
-        $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;
-}
-
-/**
  * Determines whether site meta is enabled.
  *

trunk/src/wp-includes/ms-default-filters.php

@@ -76 +76 @@
 
 // Administration.
-add_filter( 'term_id_filter', 'global_terms', 10, 2 );
 add_action( 'after_delete_post', '_update_posts_count_on_delete' );
 add_action( 'delete_post', '_update_blog_date_on_post_delete' );

trunk/src/wp-includes/ms-deprecated.php

@@ -731 +731 @@
     return $value;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-includes/ms-functions.php

@@ -2051 +2051 @@
 
 /**
- * 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
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param int    $term_id    An ID for a term on the current blog.
- * @param string $deprecated Not used.
- * @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 ( null === $global_terms_recurse ) {
-        $recurse_start        = true;
-        $global_terms_recurse = 1;
-    } elseif ( 10 < $global_terms_recurse++ ) {
-        return $term_id;
-    }
-
-    $term_id = (int) $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 ( null == $global_id ) {
-        $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_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
-        if ( null != $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;
-}
-
-/**
  * Ensures that the current site's domain is listed in the allowed redirect host list.
  *

trunk/tests/phpunit/tests/pluggable.php

@@ -83 +83 @@
             'wp_new_blog_notification',
             'wp_upgrade',
-            'install_global_terms',
         );
         $test_files     = array(
@@ -258 +257 @@
             'wp_new_blog_notification'        => array( 'blog_title', 'blog_url', 'user_id', 'password' ),
             'wp_upgrade'                      => array(),
-            'install_global_terms'            => array(),
         );