Changeset 48664

Timestamp:

07/28/2020 02:40:06 PM (4 years 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:

• capabilities.php (modified) (1 diff)
• post.php (modified) (1 diff)
• taxonomy.php (modified) (1 diff)

trunk/src/wp-includes/capabilities.php

@@ -540 +540 @@
             }
 
-            if ( 'delete_term' === $cap && ( get_option( 'default_' . $term->taxonomy ) == $term->term_id || get_option( 'default_taxonomy_' . $term->taxonomy ) == $term->term_id ) ) {
+            if ( 'delete_term' === $cap
+                && ( get_option( 'default_' . $term->taxonomy ) == $term->term_id
+                    || get_option( 'default_taxonomy_' . $term->taxonomy ) == $term->term_id )
+            ) {
                 $caps[] = 'do_not_allow';
                 break;

trunk/src/wp-includes/post.php

@@ -4055 +4055 @@
                 }
 
-                // Passed custom taxonomy list overwrites existing list if not empty.
+                // Passed custom taxonomy list overwrites the existing list if not empty.
                 $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) );
                 if ( ! empty( $terms ) && empty( $postarr['tax_input'][ $taxonomy ] ) ) {

trunk/src/wp-includes/taxonomy.php

@@ -456 +456 @@
             );
 
-            // Update term id in options.
+            // Update `term_id` in options.
             if ( ! is_wp_error( $term ) ) {
                 update_option( 'default_taxonomy_' . $taxonomy_object->name, $term['term_id'] );