sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When splitting a shared 'nav_menu' term, ensure that nav items and theme locations are retained. 

Props boonebgorges, dd32.
Fixes #33187.

git-svn-id: https://develop.svn.wordpress.org/trunk@33611 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-08-12 14:06:21 +00:00
parent 80bc70fc4b
commit ee67bd08f9
5 changed files with 107 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-admin/nav-menus.php
View File

@ -354,7 +354,13 @@ switch ( $action ) {
// Update menu items.
if ( ! is_wp_error( $_menu_object ) ) {
$messages = array_merge( $messages, wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) );
$messages = array_merge( $messages, wp_nav_menu_update_menu_items( $_nav_menu_selected_id, $nav_menu_selected_title ) );
// If the menu ID changed, redirect to the new URL.
if ( $nav_menu_selected_id != $_nav_menu_selected_id ) {
wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
exit();
}
}
}
break;

1
src/wp-includes/default-filters.php
View File

@ -330,6 +330,7 @@ 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 );
add_action( 'split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4 );
/**
* Filters formerly mixed into wp-includes

2
src/wp-includes/nav-menu.php
View File

@ -315,6 +315,8 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
if ( is_wp_error( $update_response ) )
return $update_response;
$menu_id = (int) $update_response['term_id'];
/**
* Fires after a navigation menu has been successfully updated.
*

28
src/wp-includes/taxonomy.php
View File

@ -4395,6 +4395,34 @@ function _wp_check_split_terms_in_menus( $term_id, $new_term_id, $term_taxonomy_
}
}
/**
* If the term being split is a nav_menu, change associations.
*
* @ignore
* @since 4.3.0
*
* @global wpdb $wpdb
*
* @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_nav_menu_terms( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
if ( 'nav_menu' !== $taxonomy ) {
return;
}
// Update menu locations.
$locations = get_nav_menu_locations();
foreach ( $locations as $location => $menu_id ) {
if ( $term_id == $menu_id ) {
$locations[ $location ] = $new_term_id;
}
}
set_theme_mod( 'nav_menu_locations', $locations );
}
/**
* Get data about terms that previously shared a single term_id, but have since been split.
*

69
tests/phpunit/tests/term/splitSharedTerm.php
View File

@ -195,6 +195,75 @@ class Tests_Term_SplitSharedTerm extends WP_UnitTestCase {
$this->assertEquals( $new_term_id, get_post_meta( $cat_menu_item, '_menu_item_object_id', true ) );
}
/**
* @ticket 33187
* @group navmenus
*/
public function test_nav_menu_locations_should_be_updated_on_split() {
global $wpdb;
$cat_term = wp_insert_term( 'Foo Menu', 'category' );
$shared_term_id = $cat_term['term_id'];
$nav_term_id = wp_create_nav_menu( 'Foo Menu' );
$nav_term = get_term( $nav_term_id, 'nav_menu' );
// Manually modify because shared terms shouldn't naturally occur.
$wpdb->update( $wpdb->term_taxonomy,
array( 'term_id' => $shared_term_id ),
array( 'term_taxonomy_id' => $nav_term->term_taxonomy_id )
);
set_theme_mod( 'nav_menu_locations', array( 'foo' => $shared_term_id ) );
// Splitsville.
$new_term_id = _split_shared_term( $shared_term_id, $nav_term->term_taxonomy_id );
$locations = get_nav_menu_locations();
$this->assertEquals( $new_term_id, $locations['foo'] );
}
/**
* @ticket 33187
* @group navmenus
*/
public function test_nav_menu_term_should_retain_menu_items_on_split() {
global $wpdb;
$cat_term = wp_insert_term( 'Foo Menu', 'category' );
$shared_term_id = $cat_term['term_id'];
$nav_term_id = wp_create_nav_menu( 'Foo Menu' );
$nav_term = get_term( $nav_term_id, 'nav_menu' );
// Manually modify because shared terms shouldn't naturally occur.
$wpdb->update( $wpdb->term_taxonomy,
array( 'term_id' => $shared_term_id ),
array( 'term_taxonomy_id' => $nav_term->term_taxonomy_id )
);
$t1 = wp_insert_term( 'Random term', 'category' );
$cat_menu_item = wp_update_nav_menu_item( $shared_term_id, 0, array(
'menu-item-type' => 'taxonomy',
'menu-item-object' => 'category',
'menu-item-object-id' => $t1['term_id'],
'menu-item-status' => 'publish'
) );
// Updating the menu will split the shared term.
$new_nav_menu_id = wp_update_nav_menu_object( $shared_term_id, array(
'description' => 'Updated Foo Menu',
'menu-name' => 'Updated Foo Menu',
) );
$menu = wp_get_nav_menu_object( $new_nav_menu_id );
$this->assertSame( 'Updated Foo Menu', $menu->name );
$this->assertSame( 'Updated Foo Menu', $menu->description );
$menu_items = wp_get_nav_menu_items( $new_nav_menu_id );
$this->assertEquals( array( $cat_menu_item ), wp_list_pluck( $menu_items, 'ID' ) );
}
public function test_wp_get_split_terms() {
$found = wp_get_split_terms( $this->terms['t1']['term_id'] );