diff --git a/src/wp-includes/class-wp-comment.php b/src/wp-includes/class-wp-comment.php index 80ef9bb1d3..0e9f88a352 100644 --- a/src/wp-includes/class-wp-comment.php +++ b/src/wp-includes/class-wp-comment.php @@ -191,12 +191,11 @@ final class WP_Comment { public static function get_instance( $id ) { global $wpdb; - if ( ! is_numeric( $id ) || $id != floor( $id ) || ! $id ) { + $comment_id = (int) $id; + if ( ! $comment_id ) { return false; } - $comment_id = (int) $id; - $_comment = wp_cache_get( $comment_id, 'comment' ); if ( ! $_comment ) { diff --git a/src/wp-includes/class-wp-post.php b/src/wp-includes/class-wp-post.php index c966934899..edaf149a3f 100644 --- a/src/wp-includes/class-wp-post.php +++ b/src/wp-includes/class-wp-post.php @@ -210,12 +210,11 @@ final class WP_Post { public static function get_instance( $post_id ) { global $wpdb; - if ( ! is_numeric( $post_id ) || $post_id != floor( $post_id ) || ! $post_id ) { + $post_id = (int) $post_id; + if ( ! $post_id ) { return false; } - $post_id = (int) $post_id; - $_post = wp_cache_get( $post_id, 'posts' ); if ( ! $_post ) { diff --git a/src/wp-includes/class-wp-term.php b/src/wp-includes/class-wp-term.php index 6cb4a15bd8..8eb87efbe0 100644 --- a/src/wp-includes/class-wp-term.php +++ b/src/wp-includes/class-wp-term.php @@ -125,12 +125,11 @@ final class WP_Term { public static function get_instance( $term_id, $taxonomy = null ) { global $wpdb; - if ( ! is_numeric( $term_id ) || $term_id != floor( $term_id ) || ! $term_id ) { + $term_id = (int) $term_id; + if ( ! $term_id ) { return false; } - $term_id = (int) $term_id; - $_term = wp_cache_get( $term_id, 'terms' ); // If there isn't a cached version, hit the database. diff --git a/tests/phpunit/tests/comment/wpComment.php b/tests/phpunit/tests/comment/wpComment.php index 5e3566d346..e11a14fb33 100644 --- a/tests/phpunit/tests/comment/wpComment.php +++ b/tests/phpunit/tests/comment/wpComment.php @@ -49,15 +49,6 @@ class Tests_Term_WpComment extends WP_UnitTestCase { $this->assertFalse( $found ); } - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_bool() { - $found = WP_Comment::get_instance( true ); - - $this->assertFalse( $found ); - } - /** * @ticket 37738 */ @@ -66,32 +57,4 @@ class Tests_Term_WpComment extends WP_UnitTestCase { $this->assertEquals( 1, $found->comment_ID ); } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_float() { - $found = WP_Comment::get_instance( 1.6 ); - - $this->assertFalse( $found ); - } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_array() { - $found = WP_Comment::get_instance( array( 1 ) ); - - $this->assertFalse( $found ); - } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_class() { - $class = new stdClass(); - $found = WP_Comment::get_instance( $class ); - - $this->assertFalse( $found ); - } } diff --git a/tests/phpunit/tests/post/wpPost.php b/tests/phpunit/tests/post/wpPost.php index a2e3d5a082..9b0c0995df 100644 --- a/tests/phpunit/tests/post/wpPost.php +++ b/tests/phpunit/tests/post/wpPost.php @@ -47,15 +47,6 @@ class Tests_Post_WpPost extends WP_UnitTestCase { $this->assertFalse( $found ); } - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_bool() { - $found = WP_Post::get_instance( true ); - - $this->assertFalse( $found ); - } - /** * @ticket 37738 */ @@ -64,32 +55,4 @@ class Tests_Post_WpPost extends WP_UnitTestCase { $this->assertSame( 1, $found->ID ); } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_float() { - $found = WP_Post::get_instance( 1.6 ); - - $this->assertFalse( $found ); - } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_array() { - $found = WP_Post::get_instance( array( 1 ) ); - - $this->assertFalse( $found ); - } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_class() { - $class = new stdClass(); - $found = WP_Post::get_instance( $class ); - - $this->assertFalse( $found ); - } } diff --git a/tests/phpunit/tests/term/wpTerm.php b/tests/phpunit/tests/term/wpTerm.php index a878136d81..9154633f1e 100644 --- a/tests/phpunit/tests/term/wpTerm.php +++ b/tests/phpunit/tests/term/wpTerm.php @@ -60,15 +60,6 @@ class Tests_Term_WpTerm extends WP_UnitTestCase { $this->assertFalse( $found ); } - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_bool() { - $found = WP_Term::get_instance( true ); - - $this->assertFalse( $found ); - } - /** * @ticket 37738 */ @@ -77,32 +68,4 @@ class Tests_Term_WpTerm extends WP_UnitTestCase { $this->assertSame( 1, $found->term_id ); } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_float() { - $found = WP_Term::get_instance( 1.6 ); - - $this->assertFalse( $found ); - } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_array() { - $found = WP_Term::get_instance( array( 1 ) ); - - $this->assertFalse( $found ); - } - - /** - * @ticket 37738 - */ - public function test_get_instance_should_fail_for_class() { - $class = new stdClass(); - $found = WP_Term::get_instance( $class ); - - $this->assertFalse( $found ); - } }