diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index e399e9da30..dc0c8f80d0 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -306,8 +306,4 @@ add_filter( 'authenticate', 'wp_authenticate_spam_check', 99 ); add_filter( 'determine_current_user', 'wp_validate_auth_cookie' ); add_filter( 'determine_current_user', 'wp_validate_logged_in_cookie', 20 ); -// Split term updates -add_action( 'split_shared_term', '_wp_check_split_default_terms', 10, 4 ); -add_action( 'split_shared_term', '_wp_check_split_terms_in_menus', 10, 4 ); - unset($filter, $action); diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 5f94887cb2..9099bf5b7b 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -3387,12 +3387,6 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) { $tt_id = $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) ); - // Check whether this is a shared term that needs splitting. - $_term_id = _split_shared_term( $term_id, $tt_id ); - if ( ! is_wp_error( $_term_id ) ) { - $term_id = $_term_id; - } - /** * Fires immediately before the given terms are edited. * @@ -4046,151 +4040,6 @@ function _update_generic_term_count( $terms, $taxonomy ) { } } -/** - * Create a new term for a term_taxonomy item that currently shares its term. - * - * @since 4.1.0 - * @access private - * - * @param int $term_id ID of the shared term. - * @param int $term_taxonomy_id ID of the term taxonomy item to receive a new term. - * @param array $shared_tts Sibling term taxonomies, used for busting caches. - * @return int Term ID. - */ -function _split_shared_term( $term_id, $term_taxonomy_id ) { - global $wpdb; - - // Don't try to split terms if database schema does not support shared slugs. - $current_db_version = get_option( 'db_version' ); - if ( $current_db_version < 30133 ) { - return $term_id; - } - - // If there are no shared term_taxonomy rows, there's nothing to do here. - $shared_tt_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id ) ); - if ( ! $shared_tt_count ) { - return $term_id; - } - - // Pull up data about the currently shared slug, which we'll use to populate the new one. - $shared_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.* FROM $wpdb->terms t WHERE t.term_id = %d", $term_id ) ); - - $new_term_data = array( - 'name' => $shared_term->name, - 'slug' => $shared_term->slug, - 'term_group' => $shared_term->term_group, - ); - - if ( false === $wpdb->insert( $wpdb->terms, $new_term_data ) ) { - return new WP_Error( 'db_insert_error', __( 'Could not split shared term.' ), $wpdb->last_error ); - } - - $new_term_id = (int) $wpdb->insert_id; - - // Update the existing term_taxonomy to point to the newly created term. - $wpdb->update( $wpdb->term_taxonomy, - array( 'term_id' => $new_term_id ), - array( 'term_taxonomy_id' => $term_taxonomy_id ) - ); - - // Reassign child terms to the new parent. - $term_taxonomy = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) ); - $children_tt_ids = $wpdb->get_col( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE taxonomy = %s AND parent = %d", $term_taxonomy->taxonomy, $term_id ) ); - - if ( ! empty( $children_tt_ids ) ) { - foreach ( $children_tt_ids as $child_tt_id ) { - $wpdb->update( $wpdb->term_taxonomy, - array( 'parent' => $new_term_id ), - array( 'term_taxonomy_id' => $child_tt_id ) - ); - clean_term_cache( $term_id, $term_taxonomy->taxonomy ); - } - } else { - // If the term has no children, we must force its taxonomy cache to be rebuilt separately. - clean_term_cache( $new_term_id, $term_taxonomy->taxonomy ); - } - - // Clean the cache for term taxonomies formerly shared with the current term. - $shared_term_taxonomies = $wpdb->get_row( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) ); - foreach ( (array) $shared_term_taxonomies as $shared_term_taxonomy ) { - clean_term_cache( $term_id, $shared_term_taxonomy ); - } - - // Keep a record of term_ids that have been split, keyed by old term_id. - $split_term_data = get_option( '_split_terms_' . $term_taxonomy->taxonomy, array() ); - $split_term_data[ $term_id ] = $new_term_id; - update_option( '_split_terms_' . $term_taxonomy->taxonomy, $split_term_data ); - - /** - * Fires after a previously shared taxonomy term is split into two separate terms. - * - * @since 4.1.0 - * - * @param int $term_id ID of the formerly shared term. - * @param int $new_term_id ID of the new term created for the $term_taxonomy_id. - * @param int $term_taxonomy_id ID for the term_taxonomy row affected by the split. - * @param string $taxonomy Taxonomy for the split term. - */ - do_action( 'split_shared_term', $term_id, $new_term_id, $term_taxonomy_id, $term_taxonomy->taxonomy ); - - return $new_term_id; -} - -/** - * Check default categories when a term gets split to see if any of them need - * to be updated. - * - * @since 4.1.0 - * @access private - * - * @param int $term_id ID of the formerly shared term. - * @param int $new_term_id ID of the new term created for the $term_taxonomy_id. - * @param int $term_taxonomy_id ID for the term_taxonomy row affected by the split. - * @param string $taxonomy Taxonomy for the split term. - */ -function _wp_check_split_default_terms( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) { - if ( 'category' == $taxonomy ) { - foreach ( array( 'default_category', 'default_link_category', 'default_email_category' ) as $option ) { - if ( $term_id == get_option( $option, -1 ) ) { - update_option( $option, $new_term_id ); - } - } - } -} - -/** - * Check menu items when a term gets split to see if any of them need to be - * updated. - * - * @since 4.1.0 - * @access private - * - * @param int $term_id ID of the formerly shared term. - * @param int $new_term_id ID of the new term created for the $term_taxonomy_id. - * @param int $term_taxonomy_id ID for the term_taxonomy row affected by the split. - * @param string $taxonomy Taxonomy for the split term. - */ -function _wp_check_split_terms_in_menus( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) { - global $wpdb; - $post_ids = $wpdb->get_col( $wpdb->prepare( - "SELECT m1.post_id - FROM {$wpdb->postmeta} AS m1 - INNER JOIN {$wpdb->postmeta} AS m2 ON m2.post_id=m1.post_id - INNER JOIN {$wpdb->postmeta} AS m3 ON m3.post_id=m1.post_id - WHERE ( m1.meta_key = '_menu_item_type' AND m1.meta_value = 'taxonomy' ) - AND ( m2.meta_key = '_menu_item_object' AND m2.meta_value = '%s' ) - AND ( m3.meta_key = '_menu_item_object_id' AND m3.meta_value = %d )", - $taxonomy, - $term_id - ) ); - - if ( $post_ids ) { - foreach ( $post_ids as $post_id ) { - update_post_meta( $post_id, '_menu_item_object_id', $new_term_id, $term_id ); - } - } -} - /** * Generate a permalink for a taxonomy term archive. * diff --git a/wp-includes/version.php b/wp-includes/version.php index f926fd50c2..fb1777ff8a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30584'; +$wp_version = '4.1-beta2-30585'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.