Changeset 58448

Timestamp:

06/20/2024 04:28:55 PM (7 weeks ago)

Author:

hellofromTonya

Message:

Editor (Font Library): Store font subdirectory in post meta.

Stores the font file sub-directory in the wp_font_face post meta. Similar to attachments, only the portion of the path relative to the base directory is stored.

This ensures the files can be deleted alongside their post on sites using a plugin to store font files in sub-directories. Previously running such a plugin would result in the files remaining on the file system post delete.

Reviewed by hellofromTonya.
Merges [58353] to the 6.5 branch.

Props costdev, grantmkin, peterwilsoncc.
Fixes #61297.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• src/wp-includes/fonts.php (modified) (1 diff)
• src/wp-includes/rest-api/endpoints/class-wp-rest-font-faces-controller.php (modified) (1 diff)
• tests/phpunit/tests/fonts/font-library/wpRestFontFacesController.php (modified) (2 diffs)

branches/6.5/src/wp-includes/fonts.php

@@ -229 +229 @@
 
     $font_files = get_post_meta( $post_id, '_wp_font_face_file', false );
-    $font_dir   = wp_get_font_dir()['path'];
+    $font_dir   = ;
 
     foreach ( $font_files as $font_file ) {

branches/6.5/src/wp-includes/rest-api/endpoints/class-wp-rest-font-faces-controller.php

@@ -917 +917 @@
 
         $fonts_dir = wp_get_font_dir();
-        if ( str_starts_with( $new_path, $fonts_dir['path'] ) ) {
-            $new_path = str_replace( $fonts_dir, '', $new_path );
+        if ( str_starts_with( $new_path, $fonts_dir[''] ) ) {
+            $new_path = str_replace( $fonts_dir, '', $new_path );
             $new_path = ltrim( $new_path, '/' );
         }

branches/6.5/tests/phpunit/tests/fonts/font-library/wpRestFontFacesController.php

@@ -395 +395 @@
 
         $this->assertSame( self::$font_family_id, $data['parent'], 'The returned parent id should match the font family id.' );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -1049 +1116 @@
         $file_meta = get_post_meta( $font_face_id, '_wp_font_face_file' );
 
-        foreach ( $src_attributes as $src_attribute ) {
-            $file_name = basename( $src_attribute );
-            $this->assertContains( $file_name, $file_meta, 'The uploaded font file path should be saved in the post meta.' );
+        foreach ( $e ) {
+            $;
+            $this->asserted in the post meta.' );
         }
     }