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

Check if the `$post_type` passed to `get_post_type_object()` is a `scalar` value. Non-scalars were producing PHP warnings. 

Adds unit tests.

Props Kloon.
Fixes #30013.

Built from https://develop.svn.wordpress.org/trunk@34100


git-svn-id: http://core.svn.wordpress.org/trunk@34068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-14 00:03:24 +00:00
parent fa1e1a8850
commit 5077d917a3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/post-functions.php
View File

@ -835,10 +835,11 @@ function get_post_type( $post = null ) {
function get_post_type_object( $post_type ) { function get_post_type_object( $post_type ) {
global $wp_post_types; global $wp_post_types;
if ( empty($wp_post_types[$post_type]) ) if ( ! is_scalar( $post_type ) || empty( $wp_post_types[ $post_type ] ) ) {
return null; return null;
}
return $wp_post_types[$post_type]; return $wp_post_types[ $post_type ];
} }
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34099'; $wp_version = '4.4-alpha-34100';
/** /**
* 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.