WordPress.org

Make WordPress Core

Changeset 48664


Ignore:
Timestamp:
07/28/2020 02:40:06 PM (11 months ago)
Author:
SergeyBiryukov
Message:

Coding Standards: Reformat a condifion for default taxonomy terms in map_meta_cap() for better readability.

Follow-up to [48356], [48480].

See #43517.

Location:
trunk/src/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/capabilities.php

    r48356 r48664  
    540540            }
    541541
    542             if ( 'delete_term' === $cap && ( get_option( 'default_' . $term->taxonomy ) == $term->term_id || get_option( 'default_taxonomy_' . $term->taxonomy ) == $term->term_id ) ) {
     542            if ( 'delete_term' === $cap
     543                && ( get_option( 'default_' . $term->taxonomy ) == $term->term_id
     544                    || get_option( 'default_taxonomy_' . $term->taxonomy ) == $term->term_id )
     545            ) {
    543546                $caps[] = 'do_not_allow';
    544547                break;
  • trunk/src/wp-includes/post.php

    r48658 r48664  
    40554055                }
    40564056
    4057                 // Passed custom taxonomy list overwrites existing list if not empty.
     4057                // Passed custom taxonomy list overwrites the existing list if not empty.
    40584058                $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) );
    40594059                if ( ! empty( $terms ) && empty( $postarr['tax_input'][ $taxonomy ] ) ) {
  • trunk/src/wp-includes/taxonomy.php

    r48658 r48664  
    456456            );
    457457
    458             // Update term id in options.
     458            // Update `term_id` in options.
    459459            if ( ! is_wp_error( $term ) ) {
    460460                update_option( 'default_taxonomy_' . $taxonomy_object->name, $term['term_id'] );
Note: See TracChangeset for help on using the changeset viewer.