Changeset 57878

Timestamp:

03/26/2024 01:23:14 AM (9 months ago)

Author:

peterwilsoncc

Message:

Editor: Relocate font files uploads to the uploads directory.

Relocate the upload of font files uploaded via the Font Library feature to the wp-content/uploads/fonts (or multisite equivalent) directory.

This accounts for immutable file systems in which directories are unable to be created within wp-content and deploy processes which require special consideration of the uploads directory to ensure it remains persistent between deploys.

Props azaozz, burnuser, cbirdsong, christopherplus, costdev, davidbaumwald, desrosj, elrae, euthelup, get_dave, grantmkin, hellofromtonya, janthiel, jazzs3quence, johnbillion, jorbin, justlevine, kraftner, matveb, mcsf, mmaattiiaass, nico23, peterwilsoncc, priethor, rmccue, samuelsidler, swissspidy, youknowriad.
Fixes #60845.

Location:

trunk

Files:

• src/wp-includes/fonts.php (modified) (1 diff)
• tests/phpunit/tests/fonts/font-library/wpFontsDir.php (modified) (3 diffs)

trunk/src/wp-includes/fonts.php

@@ -168 +168 @@
     }
 
-    $site_path = '';
-    if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
-        $site_path = '/sites/' . get_current_blog_id();
-    }
-
     $font_dir = array(
-        'path'    => path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path,
-        'url'     => untrailingslashit( content_url( 'fonts' ) ) . $site_path,
+        'path'    => untrailingslashit( $font_dir['basedir'] ) . '/fonts',
+        'url'     => untrailingslashit( $font_dir['baseurl'] ) . '/fonts',
         'subdir'  => '',
-        'basedir' => path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path,
-        'baseurl' => untrailingslashit( content_url( 'fonts' ) ) . $site_path,
+        'basedir' => untrailingslashit( $font_dir['basedir'] ) . '/fonts',
+        'baseurl' => untrailingslashit( $font_dir['baseurl'] ) . '/fonts',
         'error'   => false,
     );

trunk/tests/phpunit/tests/fonts/font-library/wpFontsDir.php

@@ -16 +16 @@
     public static function set_up_before_class() {
         parent::set_up_before_class();
+        $upload_dir = wp_get_upload_dir();
 
         static::$dir_defaults = array(
-            'path'    => path_join( WP_CONTENT_DIR, 'fonts' ),
-            'url'     => content_url( 'fonts' ),
+            'path'    => untrailingslashit( $upload_dir['basedir'] ) . '/fonts',
+            'url'     => untrailingslashit( $upload_dir['baseurl'] ) . '/fonts',
             'subdir'  => '',
-            'basedir' => path_join( WP_CONTENT_DIR, 'fonts' ),
-            'baseurl' => content_url( 'fonts' ),
+            'basedir' => untrailingslashit( $upload_dir['basedir'] ) . '/fonts',
+            'baseurl' => untrailingslashit( $upload_dir['baseurl'] ) . '/fonts',
             'error'   => false,
         );
     }
 
+    /**
+     * Ensure the font directory is correct.
+     */
     public function test_fonts_dir() {
         $font_dir = wp_get_font_dir();
@@ -33 +37 @@
     }
 
+    /**
+     * Ensure that the fonts directory is correct for a multisite installation.
+     *
+     * The main site will use the default location and others will follow a pattern of  `/sites/{$blog_id}/fonts`
+     *
+     * @group multisite
+     * @group ms-required
+     */
+    public function test_fonts_dir_for_multisite() {
+        $blog_id              = self::factory()->blog->create();
+        $main_site_upload_dir = wp_get_upload_dir();
+        switch_to_blog( $blog_id );
+
+        $actual   = wp_get_font_dir();
+        $expected = array(
+            'path'    => untrailingslashit( $main_site_upload_dir['basedir'] ) . "/sites/{$blog_id}/fonts",
+            'url'     => untrailingslashit( $main_site_upload_dir['baseurl'] ) . "/sites/{$blog_id}/fonts",
+            'subdir'  => '',
+            'basedir' => untrailingslashit( $main_site_upload_dir['basedir'] ) . "/sites/{$blog_id}/fonts",
+            'baseurl' => untrailingslashit( $main_site_upload_dir['baseurl'] ) . "/sites/{$blog_id}/fonts",
+            'error'   => false,
+        );
+
+        // Restore blog prior to assertions.
+        restore_current_blog();
+        $this->assertSameSets( $expected, $actual );
+    }
+
+    /**
+     * Ensure modifying the font directory via the 'font_dir' filter works.
+     */
     public function test_fonts_dir_with_filter() {
         // Define a callback function to pass to the filter.
@@ -72 +107 @@
 
     /**
+     * Ensure infinite loops are not triggered when filtering the font uploads directory.
+     *
      * @ticket 60652
      */