WordPress.org

Make WordPress Core

Ticket #15264: 15264.3.diff

File 15264.3.diff, 2.5 KB (added by wonderboymusic, 5 years ago)
  • wp-includes/default-filters.php

    diff --git wp-includes/default-filters.php wp-includes/default-filters.php
    index de97238..68cfed2 100644
    add_action( 'welcome_panel', 'wp_welcome_panel' 
    264264
    265265// Navigation menu actions
    266266add_action( 'delete_post',                '_wp_delete_post_menu_item'         );
    267 add_action( 'delete_term',                '_wp_delete_tax_menu_item'          );
     267add_action( 'delete_term',                '_wp_delete_tax_menu_item',   10, 3 );
    268268add_action( 'transition_post_status',     '_wp_auto_add_pages_to_menu', 10, 3 );
    269269
    270270// Post Thumbnail CSS class filtering
  • wp-includes/nav-menu.php

    diff --git wp-includes/nav-menu.php wp-includes/nav-menu.php
    index 794f4b2..eab50c9 100644
    function wp_setup_nav_menu_item( $menu_item ) { 
    685685 *
    686686 * @param int $object_id The ID of the original object.
    687687 * @param string $object_type The type of object, such as "taxonomy" or "post_type."
     688 * @param string $taxonomy If $object_type is "taxonomy", $taxonomy is the name of the tax that $object_id belongs to
    688689 * @return array The array of menu item IDs; empty array if none;
    689690 */
    690 function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type' ) {
     691function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type', $taxonomy = '' ) {
    691692        $object_id = (int) $object_id;
    692693        $menu_item_ids = array();
    693694
    function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_ 
    703704        );
    704705        foreach( (array) $menu_items as $menu_item ) {
    705706                if ( isset( $menu_item->ID ) && is_nav_menu_item( $menu_item->ID ) ) {
    706                         if ( get_post_meta( $menu_item->ID, '_menu_item_type', true ) != $object_type )
     707                        if ( get_post_meta( $menu_item->ID, '_menu_item_type', true ) !== $object_type ||
     708                                get_post_meta( $menu_item->ID, '_menu_item_object', true ) !== $taxonomy )
    707709                                continue;
    708710
    709711                        $menu_item_ids[] = (int) $menu_item->ID;
    function _wp_delete_post_menu_item( $object_id = 0 ) { 
    741743 * @param int $object_id The ID of the original object being trashed.
    742744 *
    743745 */
    744 function _wp_delete_tax_menu_item( $object_id = 0 ) {
     746function _wp_delete_tax_menu_item( $object_id = 0, $tt_id, $taxonomy ) {
    745747        $object_id = (int) $object_id;
    746748
    747         $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy' );
     749        $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy', $taxonomy );
    748750
    749751        foreach( (array) $menu_item_ids as $menu_item_id ) {
    750752                wp_delete_post( $menu_item_id, true );