From f2e220ffa2fc14e8cffe4d570e2f13d643848a69 Mon Sep 17 00:00:00 2001 From: isabel_brison Date: Wed, 10 Jan 2024 04:09:18 +0000 Subject: [PATCH] Editor: fix inline comment formatting. Correctly formats inline comment in `wp_get_global_stylesheet`. Follow-up to [57259]. Props mukesh27. See #60134. Built from https://develop.svn.wordpress.org/trunk@57261 git-svn-id: http://core.svn.wordpress.org/trunk@56767 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/global-styles-and-settings.php | 6 +++--- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/global-styles-and-settings.php b/wp-includes/global-styles-and-settings.php index 032913db44..acca33be1e 100644 --- a/wp-includes/global-styles-and-settings.php +++ b/wp-includes/global-styles-and-settings.php @@ -223,9 +223,9 @@ function wp_get_global_stylesheet( $types = array() ) { */ $origins = array( 'default', 'theme', 'custom' ); /* - * If the theme doesn't have theme.json but supports both appearance tools and color palette, - * the 'theme' origin should be included so color palette presets are also output. - */ + * If the theme doesn't have theme.json but supports both appearance tools and color palette, + * the 'theme' origin should be included so color palette presets are also output. + */ if ( ! $supports_theme_json && ( current_theme_supports( 'appearance-tools' ) || current_theme_supports( 'border' ) ) && current_theme_supports( 'editor-color-palette' ) ) { $origins = array( 'default', 'theme' ); } elseif ( ! $supports_theme_json ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 5ecbb167c7..3a890d30c4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.5-alpha-57260'; +$wp_version = '6.5-alpha-57261'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.