Changeset 38303

Timestamp:

08/22/2016 04:36:42 AM (8 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.

Location:

trunk/src

Files:

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

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

@@ -701 +701 @@
  * in $_REQUEST['history']
  *
- * @global array $_wp_additional_image_sizes
- *
  * @param int $post_id
  * @return \stdClass
  */
 function wp_save_image( $post_id ) {
-    global $_wp_additional_image_sizes;
+    $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
     $return = new stdClass;

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" );
+            }
         }
 

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

@@ -1368 +1368 @@
  * @since 2.9.0
  *
- * @global array $_wp_additional_image_sizes
- *
  * @param int $thumbnail_id ID of the attachment used for thumbnail
  * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
@@ -1375 +1373 @@
  */
 function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
-    global $_wp_additional_image_sizes;
+    $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
     $post               = get_post( $post );

trunk/src/wp-includes/media.php

@@ -6 +6 @@
  * @subpackage Media
  */
+
+/**
+ * Retrieve additional image sizes.
+ *
+ * @since 4.7.0
+ *
+ * @global array $_wp_additional_image_sizes
+ *
+ * @return array Additional images size data.
+ */
+function wp_get_additional_image_sizes() {
+    global $_wp_additional_image_sizes;
+    if ( ! $_wp_additional_image_sizes ) {
+        $_wp_additional_image_sizes = array();
+    }
+    return $_wp_additional_image_sizes;
+}
 
 /**
@@ -28 +45 @@
  *
  * @global int   $content_width
- * @global array $_wp_additional_image_sizes
  *
  * @param int          $width   Width of the image in pixels.
@@ -40 +56 @@
  */
 function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
-    global $content_width, $_wp_additional_image_sizes;
+    global $content_width;
+
+    $_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
     if ( ! $context )
@@ -83 +101 @@
             $max_width = min( intval($content_width), $max_width );
         }
-    } elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
+    } elseif ( ! empty( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
         $max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
         $max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-        if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
-            $max_width = min( intval($content_width), $max_width );
+        // Only in admin. Assume that theme authors know what they're doing.
+        if ( intval( $content_width ) > 0 && 'edit' === $context ) {
+            $max_width = min( intval( $content_width ), $max_width );
+        }
     }
     // $size == 'full' has no constraint
@@ -259 +279 @@
  * @since 3.9.0
  *
- * @global array $_wp_additional_image_sizes
- *
  * @param string $name The image size to check.
  * @return bool True if the image size exists, false if not.
  */
 function has_image_size( $name ) {
-    global $_wp_additional_image_sizes;
-
-    return isset( $_wp_additional_image_sizes[ $name ] );
+    $sizes = wp_get_additional_image_sizes();
+    return isset( $sizes[ $name ] );
 }
 
@@ -749 +766 @@
  * @since 3.0.0
  *
- * @global array $_wp_additional_image_sizes
- *
  * @return array Returns a filtered array of image size strings.
  */
 function get_intermediate_image_sizes() {
-    global $_wp_additional_image_sizes;
+    $_wp_additional_image_sizes = wp_get_additional_image_sizes();
     $image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
-    if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
+    if ( ! empty( $_wp_additional_image_sizes ) ) {
         $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+    }
 
     /**