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

Script Loader: Ignore deregistered dependencies in wp_dependencies_unique_hosts().

Browse Source 
Prevents a PHP warning when a handle of a deregistered dependency is still in the queue.

Fixes #37502.
Built from https://develop.svn.wordpress.org/trunk@38174


git-svn-id: http://core.svn.wordpress.org/trunk@38115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-07-31 18:25:28 +00:00
parent e64c675fc5
commit 672cf2766e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/general-template.php
View File

@ -2874,6 +2874,10 @@ function wp_dependencies_unique_hosts() {
foreach ( array( $wp_scripts, $wp_styles ) as $dependencies ) { foreach ( array( $wp_scripts, $wp_styles ) as $dependencies ) {
if ( $dependencies instanceof WP_Dependencies && ! empty( $dependencies->queue ) ) { if ( $dependencies instanceof WP_Dependencies && ! empty( $dependencies->queue ) ) {
foreach ( $dependencies->queue as $handle ) { foreach ( $dependencies->queue as $handle ) {
if ( ! isset( $dependencies->registered[ $handle ] ) ) {
continue;
}
/* @var _WP_Dependency $dependency */ /* @var _WP_Dependency $dependency */
$dependency = $dependencies->registered[ $handle ]; $dependency = $dependencies->registered[ $handle ];
$parsed = wp_parse_url( $dependency->src ); $parsed = wp_parse_url( $dependency->src );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-RC1-38173'; $wp_version = '4.6-RC1-38174';
/** /**
* 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.