From 7519268c273a25727c59bd87f55507285fd2640d Mon Sep 17 00:00:00 2001 From: Matias Benedetto Date: Thu, 15 Jun 2023 14:30:49 +0300 Subject: [PATCH 1/2] avoid white spaces on font asset paths --- admin/class-manage-fonts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/class-manage-fonts.php b/admin/class-manage-fonts.php index e55ec806..6a078d19 100644 --- a/admin/class-manage-fonts.php +++ b/admin/class-manage-fonts.php @@ -160,7 +160,7 @@ function save_local_fonts_to_theme() { ) { $font_slug = sanitize_title( $_POST['font-name'] ); $file_extension = pathinfo( $_FILES['font-file']['name'], PATHINFO_EXTENSION ); - $file_name = $font_slug . '_' . $_POST['font-style'] . '_' . $_POST['font-weight'] . '.' . $file_extension; + $file_name = sanitize_title( $font_slug . '_' . $_POST['font-style'] . '_' . $_POST['font-weight'] . '.' . $file_extension ); move_uploaded_file( $_FILES['font-file']['tmp_name'], get_stylesheet_directory() . '/assets/fonts/' . $file_name ); @@ -216,7 +216,7 @@ function save_google_fonts_to_theme() { foreach ( $variants as $variant ) { // variant name is $variant_and_url[0] and font asset url is $variant_and_url[1] $file_extension = pathinfo( $variant['src'], PATHINFO_EXTENSION ); - $file_name = $font_slug . '_' . $variant['style'] . '_' . $variant['weight'] . '.' . $file_extension; + $file_name = sanitize_title( $font_slug . '_' . $variant['style'] . '_' . $variant['weight'] . '.' . $file_extension ); // Download font asset in temp folder $temp_file = download_url( $variant['src'] ); From f583616ad40d30fe26d4f734e41179a81ae13a78 Mon Sep 17 00:00:00 2001 From: Matias Benedetto Date: Thu, 15 Jun 2023 14:50:44 +0300 Subject: [PATCH 2/2] do not sanitize file extension --- admin/class-manage-fonts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/class-manage-fonts.php b/admin/class-manage-fonts.php index 6a078d19..4a318d15 100644 --- a/admin/class-manage-fonts.php +++ b/admin/class-manage-fonts.php @@ -160,7 +160,7 @@ function save_local_fonts_to_theme() { ) { $font_slug = sanitize_title( $_POST['font-name'] ); $file_extension = pathinfo( $_FILES['font-file']['name'], PATHINFO_EXTENSION ); - $file_name = sanitize_title( $font_slug . '_' . $_POST['font-style'] . '_' . $_POST['font-weight'] . '.' . $file_extension ); + $file_name = sanitize_title( $font_slug . '_' . $_POST['font-style'] . '_' . $_POST['font-weight'] ) . '.' . $file_extension; move_uploaded_file( $_FILES['font-file']['tmp_name'], get_stylesheet_directory() . '/assets/fonts/' . $file_name ); @@ -216,7 +216,7 @@ function save_google_fonts_to_theme() { foreach ( $variants as $variant ) { // variant name is $variant_and_url[0] and font asset url is $variant_and_url[1] $file_extension = pathinfo( $variant['src'], PATHINFO_EXTENSION ); - $file_name = sanitize_title( $font_slug . '_' . $variant['style'] . '_' . $variant['weight'] . '.' . $file_extension ); + $file_name = sanitize_title( $font_slug . '_' . $variant['style'] . '_' . $variant['weight'] ) . '.' . $file_extension; // Download font asset in temp folder $temp_file = download_url( $variant['src'] );