From 65ffc1ff4210423ffe36bbfc3348b580b5fca49f Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Tue, 19 Jul 2016 21:59:44 +0000
Subject: [PATCH] Meta: Ensure `$wp_meta_keys` is an array in
 `get_registered_meta_keys()`.

Props vishalkakadiya.
Fixes #37415, See #35658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38049 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/meta.php    | 2 +-
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/meta.php b/wp-includes/meta.php
index cd684b6c91..0a8c7bc043 100644
--- a/wp-includes/meta.php
+++ b/wp-includes/meta.php
@@ -1139,7 +1139,7 @@ function unregister_meta_key( $object_type, $meta_key ) {
 function get_registered_meta_keys( $object_type ) {
 	global $wp_meta_keys;
 
-	if ( ! isset( $wp_meta_keys[ $object_type ] ) ) {
+	if ( ! is_array( $wp_meta_keys ) || ! isset( $wp_meta_keys[ $object_type ] ) ) {
 		return array();
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c86c36435b..ee6914d420 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-beta3-38107';
+$wp_version = '4.6-beta3-38108';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.