vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-04 17:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Script Loader: Allow for wp_register_script() to be called after wp_enqueue_script().

Browse Source 
When a plugin registers styles/scripts on `wp_enqueue_scripts` (as plugin authors are encouraged to do), and conditionally enqueues their script/style on `the_content` filter, things "just work". In block themes, `the_content` is run prior to the header being processed, which results in the above scenario failing.

This change makes a `wp_enqueue_script( 'example' ); wp_register_script( 'example' );` work, where as currently the enqueue silently fails (no "doing it wrong" message) and the following register has no impact. Scripts can therefore be enqueued and dequeued (by "handle") before they are registered.

Fixes #54529.


git-svn-id: https://develop.svn.wordpress.org/trunk@52338 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras
2021-12-07 17:44:46 +00:00
parent 39d6d8c03c
commit 6f546a023c
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/wp-includes/class.wp-dependencies.php
View File

@@ -94,6 +94,15 @@ class WP_Dependencies {
*/
private $all_queued_deps;
/**
* List of assets enqueued before details were registered.
*
* @since 5.9.0
*
* @var array
*/
private $queued_before_register = array();
/**
* Processes the items and dependencies.
*
@@ -248,6 +257,18 @@ class WP_Dependencies {
return false;
}
$this->registered[ $handle ] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
// If the item was enqueued before the details were registered, enqueue it now.
if ( array_key_exists( $handle, $this->queued_before_register ) ) {
if ( ! is_null( $this->queued_before_register[ $handle ] ) ) {
$this->enqueue( $handle . '?' . $this->queued_before_register[ $handle ] );
} else {
$this->enqueue( $handle );
}
unset( $this->queued_before_register[ $handle ] );
}
return true;
}
@@ -334,6 +355,12 @@ class WP_Dependencies {
if ( isset( $handle[1] ) ) {
$this->args[ $handle[0] ] = $handle[1];
}
} else if ( ! isset( $this->registered[ $handle[0] ] ) ) {
$this->queued_before_register[ $handle[0] ] = null; // $args
if ( isset( $handle[1] ) ) {
$this->queued_before_register[ $handle[0] ] = $handle[1];
}
}
}
}
@@ -360,6 +387,8 @@ class WP_Dependencies {
unset( $this->queue[ $key ] );
unset( $this->args[ $handle[0] ] );
} else if ( array_key_exists( $handle[0], $this->queued_before_register ) ) {
unset( $this->queued_before_register[ $handle[0] ] );
}
}
}

14
tests/phpunit/tests/dependencies.php
View File

@@ -136,4 +136,18 @@ class Tests_Dependencies extends WP_UnitTestCase {
$this->assertFalse( $dep->query( 'one' ) );
}
function test_enqueue_before_register() {
$dep = new WP_Dependencies;
$this->assertArrayNotHasKey( 'one', $dep->registered );
$dep->enqueue( 'one' );
$this->assertNotContains( 'one', $dep->queue );
$this->assertTrue( $dep->add( 'one', '' ) );
$this->assertContains( 'one', $dep->queue );
}
}