enmi-conf.org: comparison wp/wp-includes/theme.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 	$args     = wp_parse_args( $args, $defaults );
 	$theme_directories = search_theme_directories();
 	if ( is_array( $wp_theme_directories ) && count( $wp_theme_directories ) > 1 ) {
-		// Make sure the active theme wins out, in case search_theme_directories() picks the wrong
+		/*
-		// one in the case of a conflict. (Normally, last registered theme root wins.)
+		 * Make sure the active theme wins out, in case search_theme_directories() picks the wrong
+		 * one in the case of a conflict. (Normally, last registered theme root wins.)
+		 */
 		$current_theme = get_stylesheet();
 		if ( isset( $theme_directories[ $current_theme ] ) ) {
 			$root_of_current_theme = get_raw_theme_root( $current_theme );
 			if ( ! in_array( $root_of_current_theme, $wp_theme_directories, true ) ) {
 				$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
 		}
 	}
 	if ( null !== $args['errors'] ) {
 		foreach ( $themes as $theme => $wp_theme ) {
-			if ( $wp_theme->errors() != $args['errors'] ) {
+			if ( (bool) $wp_theme->errors() !== $args['errors'] ) {
 				unset( $themes[ $theme ] );
 			}
 		}
 	}
 /**
 * Whether a child theme is in use.
 *
 * @since 3.0.0
+* @since 6.5.0 Makes use of global template variables.
+*
+* @global string $wp_stylesheet_path Path to current theme's stylesheet directory.
+* @global string $wp_template_path   Path to current theme's template directory.
 *
 * @return bool True if a child theme is in use, false otherwise.
 */
 function is_child_theme() {
-	return ( TEMPLATEPATH !== STYLESHEETPATH );
+	global $wp_stylesheet_path, $wp_template_path;
+	return $wp_stylesheet_path !== $wp_template_path;
 }
 /**
 * Retrieves name of the current stylesheet.
 *
 /**
 * Retrieves stylesheet directory path for the active theme.
 *
 * @since 1.5.0
+* @since 6.4.0 Memoizes filter execution so that it only runs once for the current theme.
+* @since 6.4.2 Memoization removed.
 *
 * @return string Path to active theme's stylesheet directory.
 */
 function get_stylesheet_directory() {
 	$stylesheet     = get_stylesheet();
 /**
 * Retrieves template directory path for the active theme.
 *
 * @since 1.5.0
+* @since 6.4.0 Memoizes filter execution so that it only runs once for the current theme.
+* @since 6.4.1 Memoization removed.
 *
 * @return string Path to active theme's template directory.
 */
 function get_template_directory() {
 	$template     = get_template();
 	 * Set up maybe-relative, maybe-absolute array of theme directories.
 	 * We always want to return absolute, but we need to cache relative
 	 * to use in get_theme_root().
 	 */
 	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+		if ( str_starts_with( $theme_root, WP_CONTENT_DIR ) ) {
 			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
 		} else {
 			$relative_theme_roots[ $theme_root ] = $theme_root;
 		}
 	}
 	foreach ( $wp_theme_directories as $theme_root ) {
 		// Start with directories in the root of the active theme directory.
 		$dirs = @ scandir( $theme_root );
 		if ( ! $dirs ) {
-			trigger_error( "$theme_root is not readable", E_USER_NOTICE );
+			wp_trigger_error( __FUNCTION__, "$theme_root is not readable" );
 			continue;
 		}
 		foreach ( $dirs as $dir ) {
 			if ( ! is_dir( $theme_root . '/' . $dir ) || '.' === $dir[0] || 'CVS' === $dir ) {
 				continue;
 			}
 			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
-				// wp-content/themes/a-single-theme
+				/*
-				// wp-content/themes is $theme_root, a-single-theme is $dir.
+				 * wp-content/themes/a-single-theme
+				 * wp-content/themes is $theme_root, a-single-theme is $dir.
+				 */
 				$found_themes[ $dir ] = array(
 					'theme_file' => $dir . '/style.css',
 					'theme_root' => $theme_root,
 				);
 			} else {
 				$found_theme = false;
-				// wp-content/themes/a-folder-of-themes/*
+				/*
-				// wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs.
+				 * wp-content/themes/a-folder-of-themes/*
+				 * wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs.
+				 */
 				$sub_dirs = @ scandir( $theme_root . '/' . $dir );
 				if ( ! $sub_dirs ) {
-					trigger_error( "$theme_root/$dir is not readable", E_USER_NOTICE );
+					wp_trigger_error( __FUNCTION__, "$theme_root/$dir is not readable" );
 					continue;
 				}
 				foreach ( $sub_dirs as $sub_dir ) {
 					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || '.' === $dir[0] || 'CVS' === $dir ) {
 						continue;
 						'theme_file' => $dir . '/' . $sub_dir . '/style.css',
 						'theme_root' => $theme_root,
 					);
 					$found_theme                           = true;
 				}
-				// Never mind the above, it's just a theme missing a style.css.
+				/*
-				// Return it; WP_Theme will catch the error.
+				 * Never mind the above, it's just a theme missing a style.css.
+				 * Return it; WP_Theme will catch the error.
+				 */
 				if ( ! $found_theme ) {
 					$found_themes[ $dir ] = array(
 						'theme_file' => $dir . '/style.css',
 						'theme_root' => $theme_root,
 					);
 	foreach ( $found_themes as $theme_dir => $theme_data ) {
 		$theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
 	}
-	if ( get_site_transient( 'theme_roots' ) != $theme_roots ) {
+	if ( get_site_transient( 'theme_roots' ) !== $theme_roots ) {
 		set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
 	}
 	return $found_themes;
 }
 	$theme_root = '';
 	if ( $stylesheet_or_template ) {
 		$theme_root = get_raw_theme_root( $stylesheet_or_template );
 		if ( $theme_root ) {
-			// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
+			/*
-			// This gives relative theme roots the benefit of the doubt when things go haywire.
+			 * Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
+			 * This gives relative theme roots the benefit of the doubt when things go haywire.
+			 */
 			if ( ! in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
 				$theme_root = WP_CONTENT_DIR . $theme_root;
 			}
 		}
 	}
 	}
 	if ( $stylesheet_or_template && $theme_root ) {
 		if ( in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+			if ( str_starts_with( $theme_root, WP_CONTENT_DIR ) ) {
 				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			} elseif ( 0 === strpos( $theme_root, ABSPATH ) ) {
+			} elseif ( str_starts_with( $theme_root, ABSPATH ) ) {
 				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			} elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) ) {
+			} elseif ( str_starts_with( $theme_root, WP_PLUGIN_DIR ) || str_starts_with( $theme_root, WPMU_PLUGIN_DIR ) ) {
 				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
 			} else {
 				$theme_root_uri = $theme_root;
 			}
 		} else {
 	$theme_root = false;
 	// If requesting the root for the active theme, consult options to avoid calling get_theme_roots().
 	if ( ! $skip_cache ) {
-		if ( get_option( 'stylesheet' ) == $stylesheet_or_template ) {
+		if ( get_option( 'stylesheet' ) === $stylesheet_or_template ) {
 			$theme_root = get_option( 'stylesheet_root' );
-		} elseif ( get_option( 'template' ) == $stylesheet_or_template ) {
+		} elseif ( get_option( 'template' ) === $stylesheet_or_template ) {
 			$theme_root = get_option( 'template_root' );
 		}
 	}
 	if ( empty( $theme_root ) ) {
 * @since 2.5.0
 *
 * @global array                $wp_theme_directories
 * @global WP_Customize_Manager $wp_customize
 * @global array                $sidebars_widgets
+* @global array                $wp_registered_sidebars
 *
 * @param string $stylesheet Stylesheet name.
 */
 function switch_theme( $stylesheet ) {
-	global $wp_theme_directories, $wp_customize, $sidebars_widgets;
+	global $wp_theme_directories, $wp_customize, $sidebars_widgets, $wp_registered_sidebars;
 	$requirements = validate_theme_requirements( $stylesheet );
 	if ( is_wp_error( $requirements ) ) {
 		wp_die( $requirements );
 	}
 		if ( 'wp_ajax_customize_save' === current_action() ) {
 			remove_theme_mod( 'sidebars_widgets' );
 		}
 	}
+	// Stores classic sidebars for later use by block themes.
+	if ( $new_theme->is_block_theme() ) {
+		set_theme_mod( 'wp_classic_sidebars', $wp_registered_sidebars );
+	}
 	update_option( 'theme_switched', $old_theme->get_stylesheet() );
+	/*
+	 * Reset template globals when switching themes outside of a switched blog
+	 * context to ensure templates will be loaded from the new theme.
+	 */
+	if ( ! is_multisite() || ! ms_is_switched() ) {
+		wp_set_template_globals();
+	}
+	// Clear pattern caches.
+	if ( ! is_multisite() ) {
+		$new_theme->delete_pattern_cache();
+		$old_theme->delete_pattern_cache();
+	}
+	// Set autoload=no for the old theme, autoload=yes for the switched theme.
+	$theme_mods_options = array(
+		'theme_mods_' . $stylesheet                  => 'yes',
+		'theme_mods_' . $old_theme->get_stylesheet() => 'no',
+	);
+	wp_set_option_autoload_values( $theme_mods_options );
 	/**
 	 * Fires after the theme is switched.
+	 *
+	 * See {@see 'after_switch_theme'}.
 	 *
 	 * @since 1.5.0
 	 * @since 4.5.0 Introduced the `$old_theme` parameter.
 	 *
 	 * @param string   $new_name  Name of the new theme.
 	 * rather than going into an infinite loop. (This is why there are
 	 * checks against WP_DEFAULT_THEME above, also.) We also can't do anything
 	 * if it turns out there is no default theme installed. (That's `false`.)
 	 */
 	$default = WP_Theme::get_core_default_theme();
-	if ( false === $default || get_stylesheet() == $default->get_stylesheet() ) {
+	if ( false === $default || get_stylesheet() === $default->get_stylesheet() ) {
 		return true;
 	}
 	switch_theme( $default->get_stylesheet() );
 	return false;
 }
 /**
 * Retrieves theme modification value for the active theme.
 *
-* If the modification name does not exist and `$default` is a string, then the
+* If the modification name does not exist and `$default_value` is a string, then the
 * default will be passed through the {@link https://www.php.net/sprintf sprintf()}
 * PHP function with the template directory URI as the first value and the
 * stylesheet directory URI as the second value.
 *
 * @since 2.1.0
 *
-* @param string $name    Theme modification name.
+* @param string $name          Theme modification name.
-* @param mixed  $default Optional. Theme modification default value. Default false.
+* @param mixed  $default_value Optional. Theme modification default value. Default false.
 * @return mixed Theme modification value.
 */
-function get_theme_mod( $name, $default = false ) {
+function get_theme_mod( $name, $default_value = false ) {
 	$mods = get_theme_mods();
 	if ( isset( $mods[ $name ] ) ) {
 		/**
 		 * Filters the theme modification, or 'theme_mod', value.
 		 * @param mixed $current_mod The value of the active theme modification.
 		 */
 		return apply_filters( "theme_mod_{$name}", $mods[ $name ] );
 	}
-	if ( is_string( $default ) ) {
+	if ( is_string( $default_value ) ) {
 		// Only run the replacement if an sprintf() string format pattern was found.
-		if ( preg_match( '#(?<!%)%(?:\d+\$?)?s#', $default ) ) {
+		if ( preg_match( '#(?<!%)%(?:\d+\$?)?s#', $default_value ) ) {
 			// Remove a single trailing percent sign.
-			$default = preg_replace( '#(?<!%)%$#', '', $default );
+			$default_value = preg_replace( '#(?<!%)%$#', '', $default_value );
-			$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+			$default_value = sprintf( $default_value, get_template_directory_uri(), get_stylesheet_directory_uri() );
 		}
 	}
 	/** This filter is documented in wp-includes/theme.php */
-	return apply_filters( "theme_mod_{$name}", $default );
+	return apply_filters( "theme_mod_{$name}", $default_value );
 }
 /**
 * Updates theme modification value for the active theme.
 *
 	if ( is_random_header_image() ) {
 		$url = get_random_header_image();
 	}
-	return esc_url_raw( set_url_scheme( $url ) );
+	/**
+	 * Filters the header image URL.
+	 *
+	 * @since 6.1.0
+	 *
+	 * @param string $url Header image URL.
+	 */
+	$url = apply_filters( 'get_header_image', $url );
+	if ( ! is_string( $url ) ) {
+		return false;
+	}
+	$url = trim( $url );
+	return sanitize_url( set_url_scheme( $url ) );
 }
 /**
 * Creates image tag markup for a custom header image.
 *
 			if ( $srcset && $sizes ) {
 				$attr['srcset'] = $srcset;
 				$attr['sizes']  = $sizes;
 			}
 		}
+	}
+	$attr = array_merge(
+		$attr,
+		wp_get_loading_optimization_attributes( 'img', $attr, 'get_header_image_tag' )
+	);
+	/*
+	 * If the default value of `lazy` for the `loading` attribute is overridden
+	 * to omit the attribute for this image, ensure it is not included.
+	 */
+	if ( isset( $attr['loading'] ) && ! $attr['loading'] ) {
+		unset( $attr['loading'] );
+	}
+	// If the `fetchpriority` attribute is overridden and set to false or an empty string.
+	if ( isset( $attr['fetchpriority'] ) && ! $attr['fetchpriority'] ) {
+		unset( $attr['fetchpriority'] );
+	}
+	// If the `decoding` attribute is overridden and set to false or an empty string.
+	if ( isset( $attr['decoding'] ) && ! $attr['decoding'] ) {
+		unset( $attr['decoding'] );
 	}
 	/**
 	 * Filters the list of header image attributes.
 	 *
 				}
 			}
 		}
 		if ( empty( $headers ) ) {
-			return new stdClass;
+			return new stdClass();
 		}
 		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
 		$_wp_random_header->url = sprintf(
 	$header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 	if ( 'any' === $type ) {
 		if ( 'random-default-image' === $header_image_mod
 			|| 'random-uploaded-image' === $header_image_mod
-			|| ( '' !== get_random_header_image() && empty( $header_image_mod ) )
+			|| ( empty( $header_image_mod ) && '' !== get_random_header_image() )
 		) {
 			return true;
 		}
 	} else {
 		if ( "random-$type-image" === $header_image_mod ) {
 			return true;
-		} elseif ( 'default' === $type && empty( $header_image_mod ) && '' !== get_random_header_image() ) {
+		} elseif ( 'default' === $type
+			&& empty( $header_image_mod ) && '' !== get_random_header_image()
+		) {
 			return true;
 		}
 	}
 	return false;
 	if ( empty( $headers ) ) {
 		return array();
 	}
 	foreach ( (array) $headers as $header ) {
-		$url          = esc_url_raw( wp_get_attachment_url( $header->ID ) );
+		$url          = sanitize_url( wp_get_attachment_url( $header->ID ) );
 		$header_data  = wp_get_attachment_metadata( $header->ID );
 		$header_index = $header->ID;
 		$header_images[ $header_index ]                  = array();
 		$header_images[ $header_index ]['attachment_id'] = $header->ID;
 			$data['url']           = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
 			$data['thumbnail_url'] = $data['url'];
 			if ( ! empty( $_wp_default_headers ) ) {
 				foreach ( (array) $_wp_default_headers as $default_header ) {
 					$url = vsprintf( $default_header['url'], $directory_args );
-					if ( $data['url'] == $url ) {
+					if ( $data['url'] === $url ) {
 						$data                  = $default_header;
 						$data['url']           = $url;
 						$data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
 						break;
 					}
 	if ( ! $id && ! $url ) {
 		return false;
 	}
-	return esc_url_raw( set_url_scheme( $url ) );
+	return sanitize_url( set_url_scheme( $url ) );
 }
 /**
 * Displays header video URL.
 *
 */
 function _custom_background_cb() {
 	// $background is the saved custom image, or the default image.
 	$background = set_url_scheme( get_background_image() );
-	// $color is the saved custom color.
+	/*
-	// A default has to be specified in style.css. It will not be printed here.
+	 * $color is the saved custom color.
+	 * A default has to be specified in style.css. It will not be printed here.
+	 */
 	$color = get_background_color();
 	if ( get_theme_support( 'custom-background', 'default-color' ) === $color ) {
 		$color = false;
 	}
 	}
 	$style = $color ? "background-color: #$color;" : '';
 	if ( $background ) {
-		$image = ' background-image: url("' . esc_url_raw( $background ) . '");';
+		$image = ' background-image: url("' . sanitize_url( $background ) . '");';
 		// Background Position.
 		$position_x = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
 		$position_y = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
 			if ( get_stylesheet() === $args['stylesheet'] ) {
 				set_theme_mod( 'custom_css_post_id', $r );
 			}
 			// Trigger creation of a revision. This should be removed once #30854 is resolved.
-			if ( 0 === count( wp_get_post_revisions( $r ) ) ) {
+			$revisions = wp_get_latest_revision_id_and_total_count( $r );
+			if ( ! is_wp_error( $revisions ) && 0 === $revisions['count'] ) {
 				wp_save_post_revision( $r );
 			}
 		}
 	}
 		$style_dir     = get_stylesheet_directory();
 		// Support externally referenced styles (like, say, fonts).
 		foreach ( $editor_styles as $key => $file ) {
 			if ( preg_match( '~^(https?:)?//~', $file ) ) {
-				$stylesheets[] = esc_url_raw( $file );
+				$stylesheets[] = sanitize_url( $file );
 				unset( $editor_styles[ $key ] );
 			}
 		}
 		// Look in a parent theme first, that way child theme CSS overrides.
 			'about'            => array(
 				'post_type'    => 'page',
 				'post_title'   => _x( 'About', 'Theme starter content' ),
 				'post_content' => sprintf(
 					"<!-- wp:paragraph -->\n<p>%s</p>\n<!-- /wp:paragraph -->",
-					_x( 'You might be an artist who would like to introduce yourself and your work here or maybe you&rsquo;re a business with a mission to describe.', 'Theme starter content' )
+					_x( 'You might be an artist who would like to introduce yourself and your work here or maybe you are a business with a mission to describe.', 'Theme starter content' )
 				),
 			),
 			'contact'          => array(
 				'post_type'    => 'page',
 				'post_title'   => _x( 'Contact', 'Theme starter content' ),
 						$content[ $type ][ $id ] = $item;
 					}
 				}
 				break;
-			// All that's left now are posts (besides attachments).
+			/*
-			// Not a default case for the sake of clarity and future work.
+			 * All that's left now are posts (besides attachments).
+			 * Not a default case for the sake of clarity and future work.
+			 */
 			case 'posts':
 				foreach ( $config[ $type ] as $id => $item ) {
 					if ( is_array( $item ) ) {
 						// Item extends core content.
 *     ) );
 *
 * @since 2.9.0
 * @since 3.4.0 The `custom-header-uploads` feature was deprecated.
 * @since 3.6.0 The `html5` feature was added.
+* @since 3.6.1 The `html5` feature requires an array of types to be passed. Defaults to
+*              'comment-list', 'comment-form', 'search-form' for backward compatibility.
 * @since 3.9.0 The `html5` feature now also accepts 'gallery' and 'caption'.
 * @since 4.1.0 The `title-tag` feature was added.
 * @since 4.5.0 The `customize-selective-refresh-widgets` feature was added.
 * @since 4.7.0 The `starter-content` feature was added.
 * @since 5.0.0 The `responsive-embeds`, `align-wide`, `dark-editor-style`, `disable-custom-colors`,
 *              `disable-custom-font-sizes`, `editor-color-palette`, `editor-font-sizes`,
 *              `editor-styles`, and `wp-block-styles` features were added.
 * @since 5.3.0 The `html5` feature now also accepts 'script' and 'style'.
 * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
 *              by adding it to the function signature.
+* @since 5.4.0 The `disable-custom-gradients` feature limits to default gradients or gradients added
+*              through `editor-gradient-presets` theme support.
 * @since 5.5.0 The `core-block-patterns` feature was added and is enabled by default.
 * @since 5.5.0 The `custom-logo` feature now also accepts 'unlink-homepage-logo'.
-* @since 5.6.0 The `post-formats` feature warns if no array is passed.
+* @since 5.6.0 The `post-formats` feature warns if no array is passed as the second parameter.
 * @since 5.8.0 The `widgets-block-editor` feature enables the Widgets block editor.
+* @since 5.8.0 The `block-templates` feature indicates whether a theme uses block-based templates.
+* @since 6.0.0 The `html5` feature warns if no array is passed as the second parameter.
+* @since 6.1.0 The `block-template-parts` feature allows to edit any reusable template part from site editor.
+* @since 6.1.0 The `disable-layout-styles` feature disables the default layout styles.
+* @since 6.3.0 The `link-color` feature allows to enable the link color setting.
+* @since 6.3.0 The `border` feature allows themes without theme.json to add border styles to blocks.
+* @since 6.5.0 The `appearance-tools` feature enables a few design tools for blocks,
+*              see `WP_Theme_JSON::APPEARANCE_TOOLS_OPT_INS` for a complete list.
+* @since 6.6.0 The `editor-spacing-sizes` feature was added.
 *
 * @global array $_wp_theme_features
 *
 * @param string $feature The feature being added. Likely core values include:
 *                          - 'admin-bar'
 *                          - 'align-wide'
+*                          - 'appearance-tools'
 *                          - 'automatic-feed-links'
+*                          - 'block-templates'
+*                          - 'block-template-parts'
+*                          - 'border'
 *                          - 'core-block-patterns'
 *                          - 'custom-background'
 *                          - 'custom-header'
 *                          - 'custom-line-height'
 *                          - 'custom-logo'
 *                          - 'custom-spacing'
 *                          - 'custom-units'
 *                          - 'dark-editor-style'
 *                          - 'disable-custom-colors'
 *                          - 'disable-custom-font-sizes'
+*                          - 'disable-custom-gradients'
+*                          - 'disable-layout-styles'
 *                          - 'editor-color-palette'
 *                          - 'editor-gradient-presets'
 *                          - 'editor-font-sizes'
+*                          - 'editor-spacing-sizes'
 *                          - 'editor-styles'
 *                          - 'featured-content'
 *                          - 'html5'
+*                          - 'link-color'
 *                          - 'menus'
 *                          - 'post-formats'
 *                          - 'post-thumbnails'
 *                          - 'responsive-embeds'
 *                          - 'starter-content'
 *                          - 'title-tag'
-*                          - 'wp-block-styles'
 *                          - 'widgets'
 *                          - 'widgets-block-editor'
+*                          - 'wp-block-styles'
 * @param mixed  ...$args Optional extra arguments to pass along with certain features.
 * @return void|false Void on success, false on failure.
 */
 function add_theme_support( $feature, ...$args ) {
 	global $_wp_theme_features;
 			);
 			$jit = isset( $args[0]['__jit'] );
 			unset( $args[0]['__jit'] );
-			// Merge in data from previous add_theme_support() calls.
+			/*
-			// The first value registered wins. (A child theme is set up first.)
+			 * Merge in data from previous add_theme_support() calls.
+			 * The first value registered wins. (A child theme is set up first.)
+			 */
 			if ( isset( $_wp_theme_features['custom-header'] ) ) {
 				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
 			}
-			// Load in the defaults at the end, as we need to insure first one wins.
+			/*
-			// This will cause all constants to be defined, as each arg will then be set to the default.
+			 * Load in the defaults at the end, as we need to insure first one wins.
+			 * This will cause all constants to be defined, as each arg will then be set to the default.
+			 */
 			if ( $jit ) {
 				$args[0] = wp_parse_args( $args[0], $defaults );
 			}
 			/*
 			 * If a constant was defined, use that value. Otherwise, define the constant to ensure
 			 * the constant is always accurate (and is not defined later,  overriding our value).
 			 * As stated above, the first value wins.
 			 * Once we get to wp_loaded (just-in-time), define any constants we haven't already.
-			 * Constants are lame. Don't reference them. This is just for backward compatibility.
+			 * Constants should be avoided. Don't reference them. This is just for backward compatibility.
 			 */
 			if ( defined( 'NO_HEADER_TEXT' ) ) {
 				$args[0]['header-text'] = ! NO_HEADER_TEXT;
 			} elseif ( isset( $args[0]['header-text'] ) ) {
 			if ( $jit && ! empty( $args[0]['default-image'] ) ) {
 				$args[0]['random-default'] = false;
 			}
-			// If headers are supported, and we still don't have a defined width or height,
+			/*
-			// we have implicit flex sizes.
+			 * If headers are supported, and we still don't have a defined width or height,
+			 * we have implicit flex sizes.
+			 */
 			if ( $jit ) {
 				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) ) {
 					$args[0]['flex-width'] = true;
 				}
 				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) ) {
 *
 * @since 2.9.0
 *
 * @param string $feature The feature being checked. See add_theme_support() for the list
 *                        of possible values.
-* @param string $include Path to the file.
+* @param string $file    Path to the file.
 * @return bool True if the active theme supports the supplied feature, false otherwise.
 */
-function require_if_theme_supports( $feature, $include ) {
+function require_if_theme_supports( $feature, $file ) {
 	if ( current_theme_supports( $feature ) ) {
-		require $include;
+		require $file;
 		return true;
 	}
 	return false;
 }
 *
 * @access private
 * @since 3.0.0
 * @since 4.3.0 Also removes `header_image_data`.
 * @since 4.5.0 Also removes custom logo theme mods.
+* @since 6.6.0 Also removes `site_logo` option set by the site logo block.
 *
 * @param int $id The attachment ID.
 */
 function _delete_attachment_theme_mod( $id ) {
 	$attachment_image = wp_get_attachment_url( $id );
 	$header_image     = get_header_image();
 	$background_image = get_background_image();
-	$custom_logo_id   = get_theme_mod( 'custom_logo' );
+	$custom_logo_id   = (int) get_theme_mod( 'custom_logo' );
+	$site_logo_id     = (int) get_option( 'site_logo' );
-	if ( $custom_logo_id && $custom_logo_id == $id ) {
+	if ( $custom_logo_id && $custom_logo_id === $id ) {
 		remove_theme_mod( 'custom_logo' );
 		remove_theme_mod( 'header_text' );
 	}
-	if ( $header_image && $header_image == $attachment_image ) {
+	if ( $site_logo_id && $site_logo_id === $id ) {
+		delete_option( 'site_logo' );
+	}
+	if ( $header_image && $header_image === $attachment_image ) {
 		remove_theme_mod( 'header_image' );
 		remove_theme_mod( 'header_image_data' );
 	}
-	if ( $background_image && $background_image == $attachment_image ) {
+	if ( $background_image && $background_image === $attachment_image ) {
 		remove_theme_mod( 'background_image' );
 	}
 }
 /**
 			update_option( 'theme_switched_via_customizer', false );
 		}
 		if ( $old_theme->exists() ) {
 			/**
-			 * Fires on the first WP load after a theme switch if the old theme still exists.
+			 * Fires on the next WP load after the theme has been switched.
 			 *
-			 * This action fires multiple times and the parameters differs
+			 * The parameters differ according to whether the old theme exists or not.
-			 * according to the context, if the old theme exists or not.
+			 * If the old theme is missing, the old name will instead be the slug
-			 * If the old theme is missing, the parameter will be the slug
 			 * of the old theme.
+			 *
+			 * See {@see 'switch_theme'}.
 			 *
 			 * @since 3.3.0
 			 *
 			 * @param string   $old_name  Old theme name.
 			 * @param WP_Theme $old_theme WP_Theme instance of the old theme.
 	$theme             = null;
 	$autosaved         = null;
 	$messenger_channel = null;
-	// Value false indicates UUID should be determined after_setup_theme
+	/*
-	// to either re-use existing saved changeset or else generate a new UUID if none exists.
+	 * Value false indicates UUID should be determined after_setup_theme
+	 * to either re-use existing saved changeset or else generate a new UUID if none exists.
+	 */
 	$changeset_uuid = false;
-	// Set initially fo false since defaults to true for back-compat;
+	/*
-	// can be overridden via the customize_changeset_branching filter.
+	 * Set initially to false since defaults to true for back-compat;
+	 * can be overridden via the customize_changeset_branching filter.
+	 */
 	$branching = false;
 	if ( $is_customize_admin_page && isset( $input_vars['changeset_uuid'] ) ) {
 		$changeset_uuid = sanitize_key( $input_vars['changeset_uuid'] );
 	} elseif ( ! empty( $input_vars['customize_changeset_uuid'] ) ) {
 * Publishes a snapshot's changes.
 *
 * @since 4.7.0
 * @access private
 *
-* @global wpdb                 $wpdb         WordPress database abstraction object.
 * @global WP_Customize_Manager $wp_customize Customizer instance.
 *
 * @param string  $new_status     New post status.
 * @param string  $old_status     Old post status.
 * @param WP_Post $changeset_post Changeset post object.
 */
 function _wp_customize_publish_changeset( $new_status, $old_status, $changeset_post ) {
-	global $wp_customize, $wpdb;
+	global $wp_customize;
 	$is_publishing_changeset = (
 		'customize_changeset' === $changeset_post->post_type
 		&&
 		'publish' === $new_status
 		 * settings up front before doing the action.
 		 */
 		remove_action( 'customize_register', array( $wp_customize, 'register_controls' ) );
 		$wp_customize->register_controls();
-		/** This filter is documented in /wp-includes/class-wp-customize-manager.php */
+		/** This filter is documented in wp-includes/class-wp-customize-manager.php */
 		do_action( 'customize_register', $wp_customize );
 	}
 	$wp_customize->_publish_changeset_values( $changeset_post->ID );
 	/*
 * @since 3.4.0
 */
 function _wp_customize_loader_settings() {
 	$admin_origin = parse_url( admin_url() );
 	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin['host'] ) != strtolower( $home_origin['host'] ) );
+	$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
 	$browser = array(
 		'mobile' => wp_is_mobile(),
 		'ios'    => wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] ),
 	);
 * @since 5.5.0 IE8 and older are no longer supported.
 */
 function wp_customize_support_script() {
 	$admin_origin = parse_url( admin_url() );
 	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin['host'] ) != strtolower( $home_origin['host'] ) );
+	$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
-	$type_attr    = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
+	ob_start();
 	?>
-	<script<?php echo $type_attr; ?>>
+	<script>
 		(function() {
 			var request, b = document.body, c = 'className', cs = 'customize-support', rcs = new RegExp('(^|\\s+)(no-)?'+cs+'(\\s+|$)');
 	<?php	if ( $cross_domain ) : ?>
 			request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
 			// The customizer requires postMessage and CORS (if the site is cross domain).
 			b[c] += ( window.postMessage && request ? ' ' : ' no-' ) + cs;
 		}());
 	</script>
 	<?php
+	wp_print_inline_script_tag( wp_remove_surrounding_empty_script_tags( ob_get_clean() ) );
 }
 /**
 * Whether the site is being previewed in the Customizer.
 *
 	);
 	register_theme_feature(
 		'block-templates',
 		array(
 			'description'  => __( 'Whether a theme uses block-based templates.' ),
+			'show_in_rest' => true,
+		)
+	);
+	register_theme_feature(
+		'block-template-parts',
+		array(
+			'description'  => __( 'Whether a theme uses block-based template parts.' ),
 			'show_in_rest' => true,
 		)
 	);
 	register_theme_feature(
 		'custom-background',
 			'description'  => __( 'Whether the theme disables custom gradients.' ),
 			'show_in_rest' => true,
 		)
 	);
 	register_theme_feature(
+		'disable-layout-styles',
+		array(
+			'description'  => __( 'Whether the theme disables generated layout styles.' ),
+			'show_in_rest' => true,
+		)
+	);
+	register_theme_feature(
 		'editor-color-palette',
 		array(
 			'type'         => 'array',
 			'description'  => __( 'Custom color palette if defined by the theme.' ),
 			'show_in_rest' => array(
 				),
 			),
 		)
 	);
 	register_theme_feature(
+		'editor-spacing-sizes',
+		array(
+			'type'         => 'array',
+			'description'  => __( 'Custom spacing sizes if defined by the theme.' ),
+			'show_in_rest' => array(
+				'schema' => array(
+					'items' => array(
+						'type'       => 'object',
+						'properties' => array(
+							'name' => array(
+								'type' => 'string',
+							),
+							'size' => array(
+								'type' => 'string',
+							),
+							'slug' => array(
+								'type' => 'string',
+							),
+						),
+					),
+				),
+			),
+		)
+	);
+	register_theme_feature(
 		'editor-styles',
 		array(
 			'description'  => __( 'Whether theme opts in to the editor styles CSS wrapper.' ),
 			'show_in_rest' => true,
 		)
 /**
 * Returns whether the active theme is a block-based theme or not.
 *
 * @since 5.9.0
 *
-* @return boolean Whether the active theme is a block-based theme or not.
+* @return bool Whether the active theme is a block-based theme or not.
 */
 function wp_is_block_theme() {
 	return wp_get_theme()->is_block_theme();
 }
 /**
-* Adds default theme supports for block themes when the 'setup_theme' action fires.
+* Given an element name, returns a class name.
 *
-* See {@see 'setup_theme'}.
+* Alias of WP_Theme_JSON::get_element_class_name.
+*
+* @since 6.1.0
+*
+* @param string $element The name of the element.
+*
+* @return string The name of the class.
+*/
+function wp_theme_get_element_class_name( $element ) {
+	return WP_Theme_JSON::get_element_class_name( $element );
+}
+/**
+* Adds default theme supports for block themes when the 'after_setup_theme' action fires.
+*
+* See {@see 'after_setup_theme'}.
 *
 * @since 5.9.0
 * @access private
 */
 function _add_default_theme_supports() {
 	 */
 	add_theme_support( 'html5', array( 'comment-form', 'comment-list', 'search-form', 'gallery', 'caption', 'style', 'script' ) );
 	add_theme_support( 'automatic-feed-links' );
 	add_filter( 'should_load_separate_core_block_assets', '__return_true' );
-}
+	/*
+	 * Remove the Customizer's Menus panel when block theme is active.
+	 */
+	add_filter(
+		'customize_panel_active',
+		static function ( $active, WP_Customize_Panel $panel ) {
+			if (
+				'nav_menus' === $panel->id &&
+				! current_theme_supports( 'menus' ) &&
+				! current_theme_supports( 'widgets' )
+			) {
+				$active = false;
+			}
+			return $active;
+		},
+		10,
+		2
+	);
+}

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef