Changeset 55826 for trunk

Timestamp:

05/19/2023 12:44:54 PM (19 months ago)

Author:

spacedmonkey

Message:

Networks and Sites: Load WP_Metadata_Lazyloader class file if class in meta.php.

In [55818] did a check to see if WP_Metadata_Lazyloader class existed and the loaded in the class file if it did not. However, require in wp-settings.php was not removed and resulted in the class being loaded twice. To be safe, only include the class file in meta.php and remove from wp-settings.php file.

Props spacedmonkey, ryelle.
See #58185.

Location:

trunk/src

Files:

• wp-includes/meta.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/meta.php

@@ -10 +10 @@
  * @subpackage Meta
  */
+
+require ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php';
 
 /**
@@ -1215 +1217 @@
 
     if ( null === $wp_metadata_lazyloader ) {
-        if ( ! class_exists( 'WP_Metadata_Lazyloader' ) ) {
-            require_once ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php';
-        }
         $wp_metadata_lazyloader = new WP_Metadata_Lazyloader();
     }

trunk/src/wp-settings.php

@@ -189 +189 @@
 require ABSPATH . WPINC . '/class-wp-session-tokens.php';
 require ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php';
-require ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php';
 require ABSPATH . WPINC . '/general-template.php';
 require ABSPATH . WPINC . '/link-template.php';