From 3fc78a11090676b390c266d99590d5e7e6acd01c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 31 May 2015 21:54:25 +0000
Subject: [PATCH] Avoid a PHP notice in `wp_enqueue_media()` if `$post` is
 null.

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
---
 wp-includes/media.php   | 6 +++++-
 wp-includes/version.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wp-includes/media.php b/wp-includes/media.php
index a054282040..4007fec7b9 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -3008,7 +3008,11 @@ function wp_enqueue_media( $args = array() ) {
 
 	$hier = $post && is_post_type_hierarchical( $post->post_type );
 
-	$post_type_object = get_post_type_object( $post->post_type );
+	if ( $post ) {
+		$post_type_object = get_post_type_object( $post->post_type );
+	} else {
+		$post_type_object = get_post_type_object( 'post' );
+	}
 
 	$strings = array(
 		// Generic
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 88e68c39c1..7ba573ea60 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.