WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

See #43517.
Built from https://develop.svn.wordpress.org/trunk@48664


git-svn-id: http://core.svn.wordpress.org/trunk@48426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-07-28 14:42:04 +00:00
parent ba445c0a59
commit 38e6367808
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/capabilities.php
View File

@ -539,7 +539,10 @@ function map_meta_cap( $cap, $user_id, ...$args ) {
break; 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'; $caps[] = 'do_not_allow';
break; break;
} }

2
wp-includes/post.php
View File

@ -4054,7 +4054,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
$postarr['tax_input'][ $taxonomy ] = array_filter( $postarr['tax_input'][ $taxonomy ] ); $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' ) ); $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) );
if ( ! empty( $terms ) && empty( $postarr['tax_input'][ $taxonomy ] ) ) { if ( ! empty( $terms ) && empty( $postarr['tax_input'][ $taxonomy ] ) ) {
$postarr['tax_input'][ $taxonomy ] = $terms; $postarr['tax_input'][ $taxonomy ] = $terms;

2
wp-includes/taxonomy.php
View File

@ -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 ) ) { if ( ! is_wp_error( $term ) ) {
update_option( 'default_taxonomy_' . $taxonomy_object->name, $term['term_id'] ); update_option( 'default_taxonomy_' . $taxonomy_object->name, $term['term_id'] );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-beta4-48663'; $wp_version = '5.5-beta4-48664';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.