Changeset 12659

Timestamp:

01/08/2010 08:51:12 AM (17 years ago)

Author:

westi

Message:

Introduce a single function for getting all the intermediate image sizes to be used both when adding attachements and deleting. Fixes #10263 props scribu.

Location:

trunk

Files:

• wp-admin/includes/image.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/includes/image.php

@@ -103 +103 @@
                 // make thumbnails and other intermediate sizes
                 global $_wp_additional_image_sizes;
-                $temp_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
-                if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-                        $temp_sizes = array_merge( $temp_sizes, array_keys( $_wp_additional_image_sizes ) );
-
-                $temp_sizes = apply_filters( 'intermediate_image_sizes', $temp_sizes );
-
-                foreach ( $temp_sizes as $s ) {
+
+                foreach ( get_intermediate_image_sizes() as $s ) {
                         $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => FALSE );
                         if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )

trunk/wp-includes/media.php

@@ -505 +505 @@
         }
         return $data;
+}
+
+/**
+ * Get the available image sizes
+ * @since 3.0
+ * @return array Returns a filtered array of image size strings
+ */
+function get_intermediate_image_sizes() {
+        global $_wp_additional_image_sizes;
+        $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
+        if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
+                $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+
+        return apply_filters( 'intermediate_image_sizes', $image_sizes );
 }
 

trunk/wp-includes/post.php

@@ -2947 +2947 @@
 
         // remove intermediate and backup images if there are any
-        $sizes = apply_filters('intermediate_image_sizes', array('thumbnail', 'medium', 'large'));
-        foreach ( $sizes as $size ) {
+        foreach ( get_intermediate_image_sizes() as $size ) {
                 if ( $intermediate = image_get_intermediate_size($post_id, $size) ) {
                         $intermediate_file = apply_filters('wp_delete_file', $intermediate['path']);