From bc39cfc822e89817ed4debb0ce7e380d9130b776 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Mon, 12 Feb 2024 21:48:08 +0000 Subject: [PATCH] Bundled Themes: Cast font URL functions to `string` for `add_editor_style()`. This changeset ensures the result of the font URL functions is a `string` before using it in `add_editor_style()`, to avoid PHP warnings on child themes. This similarily updates Twenty Thirteen, Twenty Fourteen, Twenty Fifteen, Twenty Sixteen, and Twenty Seventeen. Props jordesign, SergeyBiryukov, sabernhardt, huzaifaalmesbah, shailu25. Fixes #59704. Built from https://develop.svn.wordpress.org/trunk@57601 git-svn-id: http://core.svn.wordpress.org/trunk@57102 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyfifteen/functions.php | 2 +- wp-content/themes/twentyfourteen/functions.php | 2 +- wp-content/themes/twentyseventeen/functions.php | 2 +- wp-content/themes/twentysixteen/functions.php | 2 +- wp-content/themes/twentythirteen/functions.php | 2 +- wp-includes/version.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php index 0a1b3a2e6d..694b995ce0 100644 --- a/wp-content/themes/twentyfifteen/functions.php +++ b/wp-content/themes/twentyfifteen/functions.php @@ -184,7 +184,7 @@ if ( ! function_exists( 'twentyfifteen_setup' ) ) : $font_stylesheet = str_replace( array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ), '', - twentyfifteen_fonts_url() + (string) twentyfifteen_fonts_url() ); add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', $font_stylesheet ) ); diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php index f6db24f3c1..924787f033 100644 --- a/wp-content/themes/twentyfourteen/functions.php +++ b/wp-content/themes/twentyfourteen/functions.php @@ -81,7 +81,7 @@ if ( ! function_exists( 'twentyfourteen_setup' ) ) : $font_stylesheet = str_replace( array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ), '', - twentyfourteen_font_url() + (string) twentyfourteen_font_url() ); add_editor_style( array( 'css/editor-style.css', $font_stylesheet, 'genericons/genericons.css' ) ); diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php index df9d3b381d..9bf1eecd49 100644 --- a/wp-content/themes/twentyseventeen/functions.php +++ b/wp-content/themes/twentyseventeen/functions.php @@ -120,7 +120,7 @@ function twentyseventeen_setup() { $font_stylesheet = str_replace( array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ), '', - twentyseventeen_fonts_url() + (string) twentyseventeen_fonts_url() ); add_editor_style( array( 'assets/css/editor-style.css', $font_stylesheet ) ); diff --git a/wp-content/themes/twentysixteen/functions.php b/wp-content/themes/twentysixteen/functions.php index a305628e0f..5e13207432 100644 --- a/wp-content/themes/twentysixteen/functions.php +++ b/wp-content/themes/twentysixteen/functions.php @@ -147,7 +147,7 @@ if ( ! function_exists( 'twentysixteen_setup' ) ) : $font_stylesheet = str_replace( array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ), '', - twentysixteen_fonts_url() + (string) twentysixteen_fonts_url() ); add_editor_style( array( 'css/editor-style.css', $font_stylesheet ) ); diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php index 3e0c3a957f..265b4b49b4 100644 --- a/wp-content/themes/twentythirteen/functions.php +++ b/wp-content/themes/twentythirteen/functions.php @@ -93,7 +93,7 @@ function twentythirteen_setup() { $font_stylesheet = str_replace( array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ), '', - twentythirteen_fonts_url() + (string) twentythirteen_fonts_url() ); add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', $font_stylesheet ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index a275d33ad5..a14f57b8a7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.5-alpha-57600'; +$wp_version = '6.5-alpha-57601'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.