From fa9a33d818470a5796f0ff8797f98b510ed8de18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 09:57:30 +0200 Subject: Merging upstream version 6.5+dfsg1. Signed-off-by: Daniel Baumann --- wp-settings.php | 74 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 11 deletions(-) (limited to 'wp-settings.php') diff --git a/wp-settings.php b/wp-settings.php index 38b03ec..9673479 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -53,8 +53,9 @@ require_once ABSPATH . WPINC . '/plugin.php'; * If not already configured, `$blog_id` will default to 1 in a single site * configuration. In multisite, it will be overridden by default in ms-settings.php. * - * @global int $blog_id * @since 2.0.0 + * + * @global int $blog_id */ global $blog_id; @@ -114,17 +115,29 @@ require ABSPATH . WPINC . '/class-wp-matchesmapregex.php'; require ABSPATH . WPINC . '/class-wp.php'; require ABSPATH . WPINC . '/class-wp-error.php'; require ABSPATH . WPINC . '/pomo/mo.php'; +require ABSPATH . WPINC . '/l10n/class-wp-translation-controller.php'; +require ABSPATH . WPINC . '/l10n/class-wp-translations.php'; +require ABSPATH . WPINC . '/l10n/class-wp-translation-file.php'; +require ABSPATH . WPINC . '/l10n/class-wp-translation-file-mo.php'; +require ABSPATH . WPINC . '/l10n/class-wp-translation-file-php.php'; /** - * @global wpdb $wpdb WordPress database abstraction object. * @since 0.71 + * + * @global wpdb $wpdb WordPress database abstraction object. */ global $wpdb; // Include the wpdb class and, if present, a db.php database drop-in. require_wp_db(); -// Set the database table prefix and the format specifiers for database table columns. +/** + * @since 3.3.0 + * + * @global string $table_prefix The database table prefix. + */ $GLOBALS['table_prefix'] = $table_prefix; + +// Set the database table prefix and the format specifiers for database table columns. wp_set_wpdb_vars(); // Start the WordPress object cache, or an external object cache if the drop-in is present. @@ -303,6 +316,9 @@ require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-widgets-controller. require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-templates-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-url-details-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-navigation-fallback-controller.php'; +require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php'; +require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php'; +require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php'; require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php'; require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-comment-meta-fields.php'; require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-post-meta-fields.php'; @@ -322,6 +338,8 @@ require ABSPATH . WPINC . '/sitemaps/class-wp-sitemaps-stylesheet.php'; require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-posts.php'; require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-taxonomies.php'; require ABSPATH . WPINC . '/sitemaps/providers/class-wp-sitemaps-users.php'; +require ABSPATH . WPINC . '/class-wp-block-bindings-source.php'; +require ABSPATH . WPINC . '/class-wp-block-bindings-registry.php'; require ABSPATH . WPINC . '/class-wp-block-editor-context.php'; require ABSPATH . WPINC . '/class-wp-block-type.php'; require ABSPATH . WPINC . '/class-wp-block-pattern-categories-registry.php'; @@ -335,6 +353,9 @@ require ABSPATH . WPINC . '/class-wp-block-parser-frame.php'; require ABSPATH . WPINC . '/class-wp-block-parser.php'; require ABSPATH . WPINC . '/class-wp-classic-to-block-menu-converter.php'; require ABSPATH . WPINC . '/class-wp-navigation-fallback.php'; +require ABSPATH . WPINC . '/block-bindings.php'; +require ABSPATH . WPINC . '/block-bindings/pattern-overrides.php'; +require ABSPATH . WPINC . '/block-bindings/post-meta.php'; require ABSPATH . WPINC . '/blocks.php'; require ABSPATH . WPINC . '/blocks/index.php'; require ABSPATH . WPINC . '/block-editor.php'; @@ -363,9 +384,26 @@ require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-css-rule.php'; require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-css-rules-store.php'; require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-processor.php'; require ABSPATH . WPINC . '/fonts/class-wp-font-face-resolver.php'; +require ABSPATH . WPINC . '/fonts/class-wp-font-collection.php'; require ABSPATH . WPINC . '/fonts/class-wp-font-face.php'; +require ABSPATH . WPINC . '/fonts/class-wp-font-library.php'; +require ABSPATH . WPINC . '/fonts/class-wp-font-utils.php'; require ABSPATH . WPINC . '/fonts.php'; +require ABSPATH . WPINC . '/class-wp-script-modules.php'; +require ABSPATH . WPINC . '/script-modules.php'; +require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api.php'; +require ABSPATH . WPINC . '/interactivity-api/class-wp-interactivity-api-directives-processor.php'; +require ABSPATH . WPINC . '/interactivity-api/interactivity-api.php'; +require ABSPATH . WPINC . '/class-wp-plugin-dependencies.php'; + +add_action( 'after_setup_theme', array( wp_script_modules(), 'add_hooks' ) ); +add_action( 'after_setup_theme', array( wp_interactivity(), 'add_hooks' ) ); +/** + * @since 3.3.0 + * + * @global WP_Embed $wp_embed WordPress Embed object. + */ $GLOBALS['wp_embed'] = new WP_Embed(); /** @@ -378,6 +416,7 @@ $GLOBALS['wp_embed'] = new WP_Embed(); * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry. */ $GLOBALS['wp_textdomain_registry'] = new WP_Textdomain_Registry(); +$GLOBALS['wp_textdomain_registry']->init(); // Load multisite-specific files. if ( is_multisite() ) { @@ -390,6 +429,11 @@ if ( is_multisite() ) { // Define must-use plugin directory constants, which may be overridden in the sunrise.php drop-in. wp_plugin_directory_constants(); +/** + * @since 3.9.0 + * + * @global array $wp_plugin_paths + */ $GLOBALS['wp_plugin_paths'] = array(); // Load must-use plugins. @@ -521,8 +565,9 @@ do_action( 'sanitize_comment_cookies' ); /** * WordPress Query object * - * @global WP_Query $wp_the_query WordPress Query object. * @since 2.0.0 + * + * @global WP_Query $wp_the_query WordPress Query object. */ $GLOBALS['wp_the_query'] = new WP_Query(); @@ -530,40 +575,45 @@ $GLOBALS['wp_the_query'] = new WP_Query(); * Holds the reference to {@see $wp_the_query}. * Use this global for WordPress queries * - * @global WP_Query $wp_query WordPress Query object. * @since 1.5.0 + * + * @global WP_Query $wp_query WordPress Query object. */ $GLOBALS['wp_query'] = $GLOBALS['wp_the_query']; /** * Holds the WordPress Rewrite object for creating pretty URLs * - * @global WP_Rewrite $wp_rewrite WordPress rewrite component. * @since 1.5.0 + * + * @global WP_Rewrite $wp_rewrite WordPress rewrite component. */ $GLOBALS['wp_rewrite'] = new WP_Rewrite(); /** * WordPress Object * - * @global WP $wp Current WordPress environment instance. * @since 2.0.0 + * + * @global WP $wp Current WordPress environment instance. */ $GLOBALS['wp'] = new WP(); /** * WordPress Widget Factory Object * - * @global WP_Widget_Factory $wp_widget_factory * @since 2.8.0 + * + * @global WP_Widget_Factory $wp_widget_factory */ $GLOBALS['wp_widget_factory'] = new WP_Widget_Factory(); /** * WordPress User Roles * - * @global WP_Roles $wp_roles WordPress role management object. * @since 2.0.0 + * + * @global WP_Roles $wp_roles WordPress role management object. */ $GLOBALS['wp_roles'] = new WP_Roles(); @@ -574,8 +624,9 @@ $GLOBALS['wp_roles'] = new WP_Roles(); */ do_action( 'setup_theme' ); -// Define the template related constants. +// Define the template related constants and globals. wp_templating_constants(); +wp_set_template_globals(); // Load the default text localization domain. load_default_textdomain(); @@ -590,8 +641,9 @@ unset( $locale_file ); /** * WordPress Locale object for loading locale domain date and various strings. * - * @global WP_Locale $wp_locale WordPress date and time locale object. * @since 2.1.0 + * + * @global WP_Locale $wp_locale WordPress date and time locale object. */ $GLOBALS['wp_locale'] = new WP_Locale(); -- cgit v1.2.3