Changeset 54482 for trunk/src/wp-includes/ms-functions.php

Timestamp:

10/11/2022 03:05:29 PM (2 years ago)

Author:

audrasjb

Message:

Networks and Sites: Ensure fileupload_maxk is an int to avoid potential fatal errors.

This changeset fixes a potential fatal error, for example when "Max upload file size" setting is set to an empty value. It also adds unit tests for upload_size_limit_filter.

Props mjkhajeh, bhrugesh12, SergeyBiryukov, kebbet, audrasjb, felipeelia.
Fixes #55926.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (1 diff)

trunk/src/wp-includes/ms-functions.php

@@ -2616 +2616 @@
  */
 function upload_size_limit_filter( $size ) {
-    $fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
+    $fileupload_maxk         = (int) get_site_option( 'fileupload_maxk', 1500 );
+    $max_fileupload_in_bytes = KB_IN_BYTES * $fileupload_maxk;
+
     if ( get_site_option( 'upload_space_check_disabled' ) ) {
-        return min( $size, $fileupload_maxk );
-    }
-
-    return min( $size, $fileupload_maxk, get_upload_space_available() );
+        return min( $size, $max_fileupload_in_bytes );
+    }
+
+    return min( $size, $max_fileupload_in_bytes, get_upload_space_available() );
 }