vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-05 07:07:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Taxonomy: Rename the default_taxonomy_$taxonomy option key to default_term_$taxonomy.

Browse Source 
This better reflects the purpose of the option.

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

See #43517.

git-svn-id: https://develop.svn.wordpress.org/trunk@48665 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2020-07-28 15:40:35 +00:00
parent 2547c15fee
commit cded42aa94
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/taxonomy.php
+4 -4
View File
@@ -444,7 +444,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
if ( ! empty( $taxonomy_object->default_term ) ) {
$term = term_exists( $taxonomy_object->default_term['name'], $taxonomy );
if ( $term ) {
update_option( 'default_taxonomy_' . $taxonomy_object->name, $term['term_id'] );
update_option( 'default_term_' . $taxonomy_object->name, $term['term_id'] );
} else {
$term = wp_insert_term(
$taxonomy_object->default_term['name'],
@@ -457,7 +457,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
// Update `term_id` in options.
if ( ! is_wp_error( $term ) ) {
update_option( 'default_taxonomy_' . $taxonomy_object->name, $term['term_id'] );
update_option( 'default_term_' . $taxonomy_object->name, $term['term_id'] );
}
}
}
@@ -508,7 +508,7 @@ function unregister_taxonomy( $taxonomy ) {
// Remove custom taxonomy default term option.
if ( ! empty( $taxonomy_object->default_term ) ) {
delete_option( 'default_taxonomy_' . $taxonomy_object->name );
delete_option( 'default_term_' . $taxonomy_object->name );
}
// Remove the taxonomy.
@@ -1834,7 +1834,7 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
// Don't delete the default custom taxonomy term.
$taxonomy_object = get_taxonomy( $taxonomy );
if ( ! empty( $taxonomy_object->default_term ) ) {
$defaults['default'] = (int) get_option( 'default_taxonomy_' . $taxonomy );
$defaults['default'] = (int) get_option( 'default_term_' . $taxonomy );
if ( $defaults['default'] === $term ) {
return 0;
}