Changeset 30981

Timestamp:

12/20/2014 10:18:12 PM (10 years ago)

Author:

wonderboymusic

Message:

In image_size_input_fields():

• Declare $out as an empty array - this is not a strict PHP requirement, but is a good practice before loops
• Most of this function was tabbed twice, instead of once

See #30799.

File:

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

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

@@ -950 +950 @@
  */
 function image_size_input_fields( $post, $check = '' ) {
-
     /**
      * Filter the names and labels of the default image sizes.
@@ -966 +965 @@
     ) );
 
-        if ( empty($check) )
-            $check = get_user_setting('imgsize', 'medium');
-
-        foreach ( $size_names as $size => $label ) {
-            $downsize = image_downsize($post->ID, $size);
-            $checked = '';
-
-            // Is this size selectable?
-            $enabled = ( $downsize[3] || 'full' == $size );
-            $css_id = "image-size-{$size}-{$post->ID}";
-
-            // If this size is the default but that's not available, don't select it.
-            if ( $size == $check ) {
-                if ( $enabled )
-                    $checked = " checked='checked'";
-                else
-                    $check = '';
-            } elseif ( !$check && $enabled && 'thumbnail' != $size ) {
-                /*
-                 * If $check is not enabled, default to the first available size
-                 * that's bigger than a thumbnail.
-                 */
-                $check = $size;
+    if ( empty( $check ) ) {
+        $check = get_user_setting('imgsize', 'medium');
+    }
+    $out = array();
+
+    foreach ( $size_names as $size => $label ) {
+        $downsize = image_downsize( $post->ID, $size );
+        $checked = '';
+
+        // Is this size selectable?
+        $enabled = ( $downsize[3] || 'full' == $size );
+        $css_id = "image-size-{$size}-{$post->ID}";
+
+        // If this size is the default but that's not available, don't select it.
+        if ( $size == $check ) {
+            if ( $enabled ) {
                 $checked = " checked='checked'";
+            } else {
+                $check = '';
             }
-
-            $html = "<div class='image-size-item'><input type='radio' " . disabled( $enabled, false, false ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
-
-            $html .= "<label for='{$css_id}'>$label</label>";
-
-            // Only show the dimensions if that choice is available.
-            if ( $enabled )
-                $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
-
-            $html .= '</div>';
-
-            $out[] = $html;
-        }
-
-        return array(
-            'label' => __('Size'),
-            'input' => 'html',
-            'html'  => join("\n", $out),
-        );
+        } elseif ( ! $check && $enabled && 'thumbnail' != $size ) {
+            /*
+             * If $check is not enabled, default to the first available size
+             * that's bigger than a thumbnail.
+             */
+            $check = $size;
+            $checked = " checked='checked'";
+        }
+
+        $html = "<div class='image-size-item'><input type='radio' " . disabled( $enabled, false, false ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
+
+        $html .= "<label for='{$css_id}'>$label</label>";
+
+        // Only show the dimensions if that choice is available.
+        if ( $enabled ) {
+            $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
+        }
+        $html .= '</div>';
+
+        $out[] = $html;
+    }
+
+    return array(
+        'label' => __( 'Size' ),
+        'input' => 'html',
+        'html'  => join( "\n", $out ),
+    );
 }