use the same format as in the wp-content/fonts default path

WordPress · Mar 12, 2024 · 25d3c80 · 25d3c80
1 parent 8e23ae4
commit 25d3c80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/wp-includes/fonts.php b/src/wp-includes/fonts.php
@@ -123,10 +123,12 @@ function wp_default_font_dir( $refresh_cache = false ) {
 	wp_mkdir_p( $defaults['path'] );
 
 	if ( ! wp_is_writable( $defaults['path'] ) ) {
-		$defaults           = wp_upload_dir();
-		$defaults['path']   = path_join( $defaults['basedir'], 'fonts' );
-		$defaults['url']    = $defaults['baseurl'] . '/fonts';
-		$defaults['subdir'] = '/fonts';
+		$defaults            = wp_upload_dir();
+		$defaults['path']    = path_join( $defaults['basedir'], 'fonts' );
+		$defaults['url']     = $defaults['baseurl'] . '/fonts';
+		$defaults['subdir']  = '';
+		$defaults['basedir'] = path_join( $defaults['basedir'], 'fonts' );
+		$defaults['baseurl'] = $defaults['baseurl'] . '/fonts';
 	}
 
 	update_option( 'font_dir', $defaults );

diff --git a/tests/phpunit/tests/fonts/wpDefaultFontDir.php b/tests/phpunit/tests/fonts/wpDefaultFontDir.php
@@ -39,9 +39,9 @@ public function test_uploads_font_dir() {
 			array(
 				'path'    => path_join( $upload_dir['basedir'], 'fonts' ),
 				'url'     => $upload_dir['baseurl'] . '/fonts',
-				'subdir'  => '/fonts',
-				'basedir' => $upload_dir['basedir'],
-				'baseurl' => $upload_dir['baseurl'],
+				'subdir'  => '',
+				'basedir' => path_join( $upload_dir['basedir'], 'fonts' ),
+				'baseurl' => $upload_dir['baseurl'] . '/fonts',
 				'error'   => false,
 			),
 			$font_dir,