From 0c541538861086926698f05eec733b815cbae76f Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Fri, 26 Oct 2018 08:12:39 +0000
Subject: [PATCH] Meta Boxes: Fix error when a meta box is rendered with a
 static method callback.

When `WP_DEBUG` is set, ensure that a static method callback is passed to `ReflectionMethod`, instead of `ReflectionFunction`.

Props DrewAPicture.
Fixes #45192.


Built from https://develop.svn.wordpress.org/branches/5.0@43830


git-svn-id: http://core.svn.wordpress.org/branches/5.0@43659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/template.php | 2 ++
 wp-includes/version.php        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 9139246411..e51903e442 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1096,6 +1096,8 @@ function do_meta_boxes( $screen, $context, $object ) {
 					if ( WP_DEBUG && ! $screen->is_block_editor() && ! isset( $_GET['meta-box-loader'] ) ) {
 						if ( is_array( $box['callback'] ) ) {
 							$reflection = new ReflectionMethod( $box['callback'][0], $box['callback'][1] );
+						} elseif ( false !== strpos( $box['callback'], '::' ) ) {
+							$reflection = new ReflectionMethod( $box['callback'] );
 						} else {
 							$reflection = new ReflectionFunction( $box['callback'] );
 						}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1f0f8804b2..0d1d0d20ae 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-beta1-43829';
+$wp_version = '5.0-beta1-43830';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.