Changeset 49451 for trunk/src/wp-includes/class-wp-taxonomy.php

Timestamp:

10/30/2020 04:57:16 AM (4 years ago)

Author:

peterwilsoncc

Message:

Taxonomy: Revert Light-weight/partial term counts.

Partial revert of [49141], [49171], [49316].

All functional changes are removed, appropriate term counting unit tests are retained.

See #40351.

File:

• trunk/src/wp-includes/class-wp-taxonomy.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-taxonomy.php

@@ -180 +180 @@
      */
     public $update_count_callback;
-
-    /**
-     * Function that will be called when the count is modified by an amount.
-     *
-     * @since 5.6.0
-     * @var callable
-     */
-    public $update_count_by_callback;
 
     /**
@@ -286 +278 @@
 
         $defaults = array(
-            'labels'                   => array(),
-            'description'              => '',
-            'public'                   => true,
-            'publicly_queryable'       => null,
-            'hierarchical'             => false,
-            'show_ui'                  => null,
-            'show_in_menu'             => null,
-            'show_in_nav_menus'        => null,
-            'show_tagcloud'            => null,
-            'show_in_quick_edit'       => null,
-            'show_admin_column'        => false,
-            'meta_box_cb'              => null,
-            'meta_box_sanitize_cb'     => null,
-            'capabilities'             => array(),
-            'rewrite'                  => true,
-            'query_var'                => $this->name,
-            'update_count_callback'    => '',
-            'update_count_by_callback' => '',
-            'show_in_rest'             => false,
-            'rest_base'                => false,
-            'rest_controller_class'    => false,
-            'default_term'             => null,
-            '_builtin'                 => false,
+            'labels'                => array(),
+            'description'           => '',
+            'public'                => true,
+            'publicly_queryable'    => null,
+            'hierarchical'          => false,
+            'show_ui'               => null,
+            'show_in_menu'          => null,
+            'show_in_nav_menus'     => null,
+            'show_tagcloud'         => null,
+            'show_in_quick_edit'    => null,
+            'show_admin_column'     => false,
+            'meta_box_cb'           => null,
+            'meta_box_sanitize_cb'  => null,
+            'capabilities'          => array(),
+            'rewrite'               => true,
+            'query_var'             => $this->name,
+            'update_count_callback' => '',
+            'show_in_rest'          => false,
+            'rest_base'             => false,
+            'rest_controller_class' => false,
+            'default_term'          => null,
+            '_builtin'              => false,
         );
 
@@ -421 +412 @@
         }
 
-        // If generic update callback is defined but increment/decrement callback is not.
-        if (
-            ! empty( $args['update_count_callback'] ) &&
-            is_callable( $args['update_count_callback'] ) &&
-            empty( $args['update_count_by_callback'] )
-        ) {
-            $args['update_count_by_callback'] = function( $tt_ids, $taxonomy ) use ( $args ) {
-                return call_user_func( $args['update_count_callback'], $tt_ids, $taxonomy );
-            };
-        }
-
         foreach ( $args as $property_name => $property_value ) {
             $this->$property_name = $property_value;