From 2547c15fee58b4eb0ed8637f8d4837737b832688 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 28 Jul 2020 14:40:06 +0000 Subject: [PATCH] Coding Standards: Reformat a condifion for default taxonomy terms in `map_meta_cap()` for better readability. Follow-up to [48356], [48480]. See #43517. git-svn-id: https://develop.svn.wordpress.org/trunk@48664 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/capabilities.php | 5 ++++- src/wp-includes/post.php | 2 +- src/wp-includes/taxonomy.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/capabilities.php b/src/wp-includes/capabilities.php index d2eae061bc..6b6182a030 100644 --- a/src/wp-includes/capabilities.php +++ b/src/wp-includes/capabilities.php @@ -539,7 +539,10 @@ function map_meta_cap( $cap, $user_id, ...$args ) { break; } - 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; } diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php index d92d9617f2..dfaec48149 100644 --- a/src/wp-includes/post.php +++ b/src/wp-includes/post.php @@ -4054,7 +4054,7 @@ function wp_insert_post( $postarr, $wp_error = false ) { $postarr['tax_input'][ $taxonomy ] = array_filter( $postarr['tax_input'][ $taxonomy ] ); } - // 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 ] ) ) { $postarr['tax_input'][ $taxonomy ] = $terms; diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php index 69355a3fb0..d7179fa31b 100644 --- a/src/wp-includes/taxonomy.php +++ b/src/wp-includes/taxonomy.php @@ -455,7 +455,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { ) ); - // 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'] ); }