Changeset 55872

Timestamp:

05/30/2023 07:44:56 PM (19 months ago)

Author:

johnbillion

Message:

Media: Correct the fallback value passed to the $mimes parameter of wp_check_filetype_and_ext() from _wp_handle_upload(), and update corresponding documentation.

Previously when the mimes element was not specified in the overrides array passed to _wp_handle_upload() it resulted in boolean false being passed to this parameter, which is incorrect. The fallback value should be null.

Props platonkristinin, pkbhatt

Fixes #58349

Location:

trunk/src

Files:

• wp-admin/includes/file.php (modified) (1 diff)
• wp-includes/functions.php (modified) (4 diffs)

trunk/src/wp-admin/includes/file.php

@@ -891 +891 @@
     // If you override this, you must provide $ext and $type!!
     $test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
-    $mimes     = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
+    $mimes     = isset( $overrides['mimes'] ) ? $overrides['mimes'] : null;
 
     // A correct form post will pass this test.

trunk/src/wp-includes/functions.php

@@ -3013 +3013 @@
  * @since 2.0.4
  *
- * @param string   $filename File name or path.
- * @param string[] $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
- *                           Defaults to the result of get_allowed_mime_types().
+ * @param string        $filename File name or path.
+ * @param string[]|null $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
+ *                                Defaults to the result of get_allowed_mime_types().
  * @return array {
  *     Values for the extension and mime type.
@@ -3054 +3054 @@
  * @since 3.0.0
  *
- * @param string   $file     Full path to the file.
- * @param string   $filename The name of the file (may differ from $file due to $file being
- *                           in a tmp directory).
- * @param string[] $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
- *                           Defaults to the result of get_allowed_mime_types().
+ * @param string        $file     Full path to the file.
+ * @param string        $filename The name of the file (may differ from $file due to $file being
+ *                                in a tmp directory).
+ * @param string[]|null $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
+ *                                Defaults to the result of get_allowed_mime_types().
  * @return array {
  *     Values for the extension, mime type, and corrected filename.
@@ -3240 +3240 @@
      * @since 5.1.0 The $real_mime parameter was added.
      *
-     * @param array        $wp_check_filetype_and_ext {
+     * @param array         $wp_check_filetype_and_ext {
      *     Values for the extension, mime type, and corrected filename.
      *
@@ -3247 +3247 @@
      *     @type string|false $proper_filename File name with its correct extension, or false if it cannot be determined.
      * }
-     * @param string       $file                      Full path to the file.
-     * @param string       $filename                  The name of the file (may differ from $file due to
-     *                                                $file being in a tmp directory).
-     * @param string[]     $mimes                     Array of mime types keyed by their file extension regex.
-     * @param string|false $real_mime                 The actual mime type or false if the type cannot be determined.
+     * @param string        $file                      Full path to the file.
+     * @param string        $filename                  The name of the file (may differ from $file due to
+     *                                                 $file being in a tmp directory).
+     * @param string[]|null $mimes                     Array of mime types keyed by their file extension regex, or null if
+     *                                                 none were provided.
+     * @param string|false  $real_mime                 The actual mime type or false if the type cannot be determined.
      */
     return apply_filters( 'wp_check_filetype_and_ext', compact( 'ext', 'type', 'proper_filename' ), $file, $filename, $mimes, $real_mime );