Changeset 38303 for trunk/src/wp-admin/includes/image.php

Timestamp:

08/22/2016 04:36:42 AM (10 years ago)

Author:

wonderboymusic

Message:

Media: add a function, wp_get_additional_image_sizes(), that wraps the retrieval of the global $_wp_additional_image_sizes. Removes 6 global imports.

See #37699.

File:

• trunk/src/wp-admin/includes/image.php (modified) (2 diffs)

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

@@ -68 +68 @@
  * @since 2.1.0
  *
- * @global array $_wp_additional_image_sizes
- *
  * @param int $attachment_id Attachment Id to process.
  * @param string $file Filepath of the Attached image.
@@ -88 +86 @@
 
                 // Make thumbnails and other intermediate sizes.
-                global $_wp_additional_image_sizes;
+                $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
                 $sizes = array();
                 foreach ( get_intermediate_image_sizes() as $s ) {
                         $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
-                        if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
-                                $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
-                        else
-                                $sizes[$s]['width'] = get_option( "{$s}_size_w" ); // For default sizes set in options
-                        if ( isset( $_wp_additional_image_sizes[$s]['height'] ) )
-                                $sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); // For theme-added sizes
-                        else
-                                $sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options
-                        if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) )
-                                $sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop']; // For theme-added sizes
-                        else
-                                $sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options
+                        if ( isset( $_wp_additional_image_sizes[$s]['width'] ) ) {
+                                // For theme-added sizes
+                                $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] );
+                        } else {
+                                // For default sizes set in options
+                                $sizes[$s]['width'] = get_option( "{$s}_size_w" );
+                        }
+
+                        if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) {
+                                // For theme-added sizes
+                                $sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] );
+                        } else {
+                                // For default sizes set in options
+                                $sizes[$s]['height'] = get_option( "{$s}_size_h" );
+                        }
+
+                        if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) {
+                                // For theme-added sizes
+                                $sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop'];
+                        } else {
+                                // For default sizes set in options
+                                $sizes[$s]['crop'] = get_option( "{$s}_crop" );
+                        }
                 }