Changeset 57503 for trunk/src/wp-includes/script-modules.php

Timestamp:

01/31/2024 06:14:30 PM (3 years ago)

Author:

swissspidy

Message:

Script Loader: Use a global variable in wp_script_modules().

This brings the function more in line with its related wp_scripts() and wp_styles() functions and makes it easier to reset the class instance in tests.

Props westonruter, luisherranz.
See #56313.

File:

• trunk/src/wp-includes/script-modules.php (modified) (2 diffs)

trunk/src/wp-includes/script-modules.php

@@ -15 +15 @@
  * if it doesn't exist yet.
  *
+ * @global WP_Script_Modules $wp_script_modules
+ *
  * @since 6.5.0
  *
@@ -20 +22 @@
  */
 function wp_script_modules(): WP_Script_Modules {
-        static $instance = null;
-        if ( is_null( $instance ) ) {
-                $instance = new WP_Script_Modules();
-                $instance->add_hooks();
+        global $wp_script_modules;
+
+        if ( ! ( $wp_script_modules instanceof WP_Script_Modules ) ) {
+                $wp_script_modules = new WP_Script_Modules();
         }
-        return $instance;
+
+        return $wp_script_modules;
 }