Changeset 57740 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-font-faces-controller.php

Timestamp:

02/29/2024 10:15:20 AM (3 years ago)

Author:

youknowriad

Message:

Editor: Prevent infinite loops when filtering the font library folder.

Changing the font library is something we expect hosts to perform.
It's important that we make this filter as seemless as possible.
This commit prevents a potential infinite loop caused by calling wp_get_upload_dir() within the font_dir filter.

Props mmaattiiaass, ironprogrammer, costdev, swissspidy.
Fixes #60652.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-font-faces-controller.php (modified) (3 diffs)

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

@@ -857 +857 @@
         protected function handle_font_file_upload( $file ) {
                 add_filter( 'upload_mimes', array( 'WP_Font_Utils', 'get_allowed_font_mime_types' ) );
-                add_filter( 'upload_dir', 'wp_get_font_dir' );
+
+                /*
+                 * Set the upload directory to the fonts directory.
+                 *
+                 * wp_get_font_dir() contains the 'font_dir' hook, whose callbacks are
+                 * likely to call wp_get_upload_dir().
+                 *
+                 * To avoid an infinite loop, don't hook wp_get_font_dir() to 'upload_dir'.
+                 * Instead, just pass its return value to the 'upload_dir' callback.
+                 */
+                $font_dir       = wp_get_font_dir();
+                $set_upload_dir = function () use ( $font_dir ) {
+                        return $font_dir;
+                };
+                add_filter( 'upload_dir', $set_upload_dir );
 
                 $overrides = array(
@@ -875 +889 @@
                 $uploaded_file = wp_handle_upload( $file, $overrides );
 
-                remove_filter( 'upload_dir', 'wp_get_font_dir' );
+                remove_filter( 'upload_dir', $set_upload_dir );
                 remove_filter( 'upload_mimes', array( 'WP_Font_Utils', 'get_allowed_font_mime_types' ) );
 
@@ -903 +917 @@
 
         /**
-        * Returns relative path to an uploaded font file.
-        *
-        * The path is relative to the current fonts directory.
-        *
-        * @since 6.5.0
-        * @access private
-        *
-        * @param string $path Full path to the file.
-        * @return string Relative path on success, unchanged path on failure.
-        */
+         * Returns relative path to an uploaded font file.
+         *
+         * The path is relative to the current fonts directory.
+         *
+         * @since 6.5.0
+         * @access private
+         *
+         * @param string $path Full path to the file.
+         * @return string Relative path on success, unchanged path on failure.
+         */
         protected function relative_fonts_path( $path ) {
                 $new_path = $path;