IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid a PHP notice in wp_enqueue_media() if $post is null.

Browse Source 
see #19257.
Built from https://develop.svn.wordpress.org/trunk@32675


git-svn-id: http://core.svn.wordpress.org/trunk@32645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-05-31 21:54:25 +00:00
parent ff3f2ac243
commit 3fc78a1109
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/media.php
View File

@ -3008,7 +3008,11 @@ function wp_enqueue_media( $args = array() ) {
$hier = $post && is_post_type_hierarchical( $post->post_type ); $hier = $post && is_post_type_hierarchical( $post->post_type );
if ( $post ) {
$post_type_object = get_post_type_object( $post->post_type ); $post_type_object = get_post_type_object( $post->post_type );
} else {
$post_type_object = get_post_type_object( 'post' );
}
$strings = array( $strings = array(
// Generic // Generic

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32674'; $wp_version = '4.3-alpha-32675';
/** /**
* 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.