From a3e36194fd44bd18a570cf96b059094dfad7a366 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Tue, 6 Oct 2015 13:54:25 +0000 Subject: [PATCH] Scripts: in `WP_Scripts::set_group()`, the `args` prop of the `_WP_Dependency` instance defaults to `null` - check that it is set before comparing. Props tivnet, chriscct7. Fixes #25462. Built from https://develop.svn.wordpress.org/trunk@34862 git-svn-id: http://core.svn.wordpress.org/trunk@34827 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class.wp-scripts.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php index 2cca26c691..52c6824b5a 100644 --- a/wp-includes/class.wp-scripts.php +++ b/wp-includes/class.wp-scripts.php @@ -247,7 +247,7 @@ class WP_Scripts extends WP_Dependencies { * @return bool Not already in the group or a lower group */ public function set_group( $handle, $recursion, $group = false ) { - if ( $this->registered[$handle]->args === 1 ) + if ( isset( $this->registered[$handle]->args ) && $this->registered[$handle]->args === 1 ) $grp = 1; else $grp = (int) $this->get_data( $handle, 'group' ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 02574047a7..a224a9fad7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34861'; +$wp_version = '4.4-alpha-34862'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.