Changeset 13101

Timestamp:

01/10/2024 02:13:55 AM (16 months ago)

Author:

dd32

Message:

Theme Directory: Enforce the 10MB theme upload limit.

Fixes #5843.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory

Files:

• class-wporg-themes-upload.php (modified) (2 diffs)
• upload.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -205 +205 @@
         }
 
+        // Validate it's not too large.
+        if ( $size > wp_max_upload_size() ) {
+            return new WP_Error(
+                'file_too_big',
+                sprintf(
+                    __( 'Maximum allowed file size: %s', 'wporg-themes' ),
+                    esc_html( size_format( wp_max_upload_size() ) )
+                )
+            );
+        }
+
         // Validate that the file is a ZIP file before processing it.
         $check = wp_check_filetype_and_ext(
@@ -288 +299 @@
 
         $valid_upload = $this->validate_upload( $file_upload );
-        if ( ! $valid_upload ) {
+        if ( is_wp_error( $valid_upload ) ) {
+            return $valid_upload;
+        } elseif ( ! $valid_upload ) {
             return new WP_Error(
                 'invalid_input',

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php

@@ -64 +64 @@
         if ( 'pre_upload_terms' === $code ) {
             $terms_notice = "<div class='notice notice-error notice-large'><ul>{$notice_content}</ul></div>";
+        } elseif ( is_wp_error( $messages ) ) {
+            $notice = "<div class='notice notice-error notice-large'><ul>{$notice_content}</ul></div>";
         } else {
             $notice = "<div class='notice notice-warning notice-large'><ul>{$notice_content}</ul></div>";