Ticket #5221: 5221.patch

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

@@ -201 +201 @@
                                                         printf(
                                                                 /* 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() ) )
                                                         );
                                                         ?>
                                                 </small>
@@ -250 +250 @@
                 return ob_get_clean();
         }
 
-        /**
-         * 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 ];
-        }
 }

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

@@ -47 +47 @@
                         <input type="file" id="zip_file" name="zip_file" size="25"/>
                         <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>';
 
@@ -55 +55 @@
 }
 
 /**
- * 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 ];
-}
-
-/**
  * Runs basic checks and hands off to the upload processor.
  *
  * @return string Failure or success message.