Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This change introduces two optional parameters, $post_type and `$po… #8289

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

This change introduces two optional parameters, $post_type and `$po… #8289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/wp-includes/post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4876,7 +4876,7 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
}

if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
wp_set_post_categories( $post_id, $post_category );
wp_set_post_categories( $post_id, $post_category, $post_type, $post_status );
}

if ( isset( $postarr['tags_input'] ) && is_object_in_taxonomy( $post_type, 'post_tag' ) ) {
Expand Down Expand Up @@ -5661,18 +5661,26 @@ function wp_set_post_terms( $post_id = 0, $terms = '', $taxonomy = 'post_tag', $
*
* @since 2.1.0
*
* @param int $post_id Optional. The Post ID. Does not default to the ID
* @param int $post_id Optional. The Post ID. Does not default to the ID
* of the global $post. Default 0.
* @param int[]|int $post_categories Optional. List of category IDs, or the ID of a single category.
* Default empty array.
* @param bool $append If true, don't delete existing categories, just add on.
* @param bool $append If true, don't delete existing categories, just add on.
* If false, replace the categories with the new categories.
* @param string $post_type Optional. Post type. Default empty.
* @param string $post_status Optional. Post status. Default empty.
*
* @return array|false|WP_Error Array of term taxonomy IDs of affected categories. WP_Error or false on failure.
*/
function wp_set_post_categories( $post_id = 0, $post_categories = array(), $append = false ) {
$post_id = (int) $post_id;
$post_type = get_post_type( $post_id );
$post_status = get_post_status( $post_id );
function wp_set_post_categories( $post_id = 0, $post_categories = array(), $append = false, $post_type = '', $post_status = '' ) {

$post_id = (int) $post_id;
if ( '' === $post_type ) {
$post_type = get_post_type( $post_id );
}
if ( '' === $post_status ) {
$post_status = get_post_status( $post_id );
}

// If $post_categories isn't already an array, make it one.
$post_categories = (array) $post_categories;
Expand Down
53 changes: 53 additions & 0 deletions tests/phpunit/tests/admin/includesPost.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,59 @@
$this->assertSame( $terms3, $updated_terms3, 'Post 3 should have terms 1 and 3.' );
}

/**
* Test to check if a DB call is saved if the $post_type , $post_status perms are set when wp_set_post_categories is called.
*
* @ticket 27736
*/
/**
* Test to check if a DB call is saved if the $post_type and $post_status parameters are set when wp_set_post_categories is called.
*
* @ticket 27736
*/
public function test_wp_set_post_categories_with_post_type_and_status() {
global $wpdb;

wp_set_current_user( self::$admin_id );

$post_id = self::factory()->post->create(

Check warning on line 437 in tests/phpunit/tests/admin/includesPost.php

View workflow job for this annotation

GitHub Actions / PHP coding standards / Run coding standards checks 

Equals sign not aligned with surrounding assignments; expected 3 spaces but found 1 space
array(
'post_type' => 'page',
'post_status' => 'draft',
)
);
$post_id_2 = self::factory()->post->create(
array(
'post_type' => 'page',
'post_status' => 'draft',
)
);
$term_id = self::factory()->category->create();
$term_id_2 = self::factory()->category->create();

$num_queries = $wpdb->num_queries;

wp_set_post_categories( $post_id, array( $term_id ), true, 'page', 'draft' );

$num_queries_done = $wpdb->num_queries - $num_queries;
// Check if the number of queries remains the same
$this->assertSame( 6, $num_queries_done, 'Extra DB query performed when post_type and post_status are provided.' );

$num_queries = $wpdb->num_queries;

wp_set_post_categories( $post_id_2, array( $term_id_2 ), true );

$num_queries_done = $wpdb->num_queries - $num_queries;
// Check if the number of queries remains the same
$this->assertSame( 6, $num_queries_done, 'Extra DB query performed when post_type and post_status are provided.' );

// Clean up
wp_delete_post( $post_id, true );
wp_delete_term( $term_id, 'category' );
wp_delete_post( $post_id_2, true );
wp_delete_term( $term_id_2, 'category' );
}

/**
* @ticket 11302
*/
Expand Down
Loading