Changeset 9887

Timestamp:

05/19/2020 08:14:31 PM (5 years ago)

Author:

ocean90

Message:

Theme/Plugin Directory: Use size_format() when displaying allowed upload file size.

See #5221.

Location:

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

Files:

• plugin-directory/shortcodes/class-upload.php (modified) (2 diffs)
• theme-directory/upload.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php

@@ -202 +202 @@
                                 /* translators: Maximum allowed file size. */
                                 esc_html__( 'Maximum allowed file size: %s', 'wporg-plugins' ),
-                                esc_html( self::get_max_allowed_file_size() )
+                                esc_html( size_format( wp_max_upload_size() ) )
                             );
                             ?>
@@ -251 +251 @@
     }
 
-    /**
-     * Returns a human readable version of the max allowed upload size.
-     *
-     * @return string The allowed file size.
-     */
-    public static function get_max_allowed_file_size() {
-        $upload_size_unit = wp_max_upload_size();
-
-        $byte_sizes       = array( 'KB', 'MB', 'GB' );
-
-        for ( $unit = - 1; $upload_size_unit > 1024 && $unit < count( $byte_sizes ) - 1; $unit ++ ) {
-            $upload_size_unit /= 1024;
-        }
-
-        if ( $unit < 0 ) {
-            $upload_size_unit = $unit = 0;
-        } else {
-            $upload_size_unit = (int) $upload_size_unit;
-        }
-
-        return $upload_size_unit . $byte_sizes[ $unit ];
-    }
 }

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

@@ -48 +48 @@
             <button id="upload_button" class="button" type="submit" value="' . esc_attr__( 'Upload', 'wporg-themes' ) . '">' . esc_html__( 'Upload', 'wporg-themes' ) . '</button>
             <p>
-                <small>' . sprintf( __( 'Maximum allowed file size: %s', 'wporg-themes' ), esc_html( wporg_themes_get_max_allowed_file_size() ) ) . '</small>
+                <small>' . sprintf( __( 'Maximum allowed file size: %s', 'wporg-themes' ), esc_html( size_format( wp_max_upload_size() ) ) ) . '</small>
             </p>
         </form>';
 
     return $notice . $form;
-}
-
-/**
- * Returns a human readable version of the max allowed upload size.
- *
- * @return string The allowed file size.
- */
-function wporg_themes_get_max_allowed_file_size() {
-    $upload_size_unit = wp_max_upload_size();
-    $byte_sizes       = array( 'KB', 'MB', 'GB' );
-
-    for ( $unit = - 1; $upload_size_unit > 1024 && $unit < count( $byte_sizes ) - 1; $unit++ ) {
-        $upload_size_unit /= 1024;
-    }
-    if ( $unit < 0 ) {
-        $upload_size_unit = $unit = 0;
-    } else {
-        $upload_size_unit = (int) $upload_size_unit;
-    }
-    return $upload_size_unit . $byte_sizes[ $unit ];
 }