Changeset 12188 for trunk/wp-admin/includes/media.php

Timestamp:

11/16/2009 01:37:30 AM (17 years ago)

Author:

azaozz

Message:

Fix improper selection of radio buttons, improve JS for storing image settings, fixes #11021

File:

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

trunk/wp-admin/includes/media.php

@@ -781 +781 @@
 function image_align_input_fields( $post, $checked = '' ) {
 
+        if ( empty($checked) )
+                $checked = get_user_setting('align', 'none');
+
         $alignments = array('none' => __('None'), 'left' => __('Left'), 'center' => __('Center'), 'right' => __('Right'));
         if ( !array_key_exists( (string) $checked, $alignments ) )
@@ -786 +789 @@
 
         $out = array();
-        foreach ($alignments as $name => $label) {
+        foreach ( $alignments as $name => $label ) {
                 $name = esc_attr($name);
                 $out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'".
                         ( $checked == $name ? " checked='checked'" : "" ) .
-                        " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>" . $label . "</label>";
+                        " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>$label</label>";
         }
         return join("\n", $out);
@@ -804 +807 @@
  * @return unknown
  */
-function image_size_input_fields( $post, $checked = '' ) {
+function image_size_input_fields( $post, $check = '' ) {
 
                 // get a list of the actual pixel dimensions of each possible intermediate version of this image
                 $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size'));
 
-                foreach ( $size_names as $size => $name ) {
+                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?
@@ -816 +823 @@
                         $css_id = "image-size-{$size}-{$post->ID}";
                         // if this size is the default but that's not available, don't select it
-                        if ( $checked && !$enabled )
-                                $checked = '';
-                        // if $checked was not specified, default to the first available size that's bigger than a thumbnail
-                        if ( !$checked && $enabled && 'thumbnail' != $size )
-                                $checked = $size;
-
-                        $html = "<div class='image-size-item'><input type='radio' ".( $enabled ? '' : "disabled='disabled'")."name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'".( $checked == $size ? " checked='checked'" : '') ." />";
-
-                        $html .= "<label for='{$css_id}'>" . __($name). "</label>";
+                        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;
+                                $checked = " checked='checked'";
+                        }
+
+                        $html = "<div class='image-size-item'><input type='radio' " . ( $enabled ? '' : "disabled='disabled' " ) . "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 )
@@ -850 +862 @@
  * @return unknown
  */
-function image_link_input_fields($post, $url_type='') {
+function image_link_input_fields($post, $url_type = '') {
 
         $file = wp_get_attachment_url($post->ID);
         $link = get_attachment_link($post->ID);
+
+        if ( empty($url_type) )
+                $url_type = get_user_setting('urlbutton', 'post');
 
         $url = '';
@@ -861 +876 @@
                 $url = $link;
 
-        return "<input type='text' class='urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
-                                <button type='button' class='button urlnone' title=''>" . __('None') . "</button>
-                                <button type='button' class='button urlfile' title='" . esc_attr($file) . "'>" . __('File URL') . "</button>
-                                <button type='button' class='button urlpost' title='" . esc_attr($link) . "'>" . __('Post URL') . "</button>
+        return "
+        <input type='text' class='urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
+        <button type='button' class='button urlnone' title=''>" . __('None') . "</button>
+        <button type='button' class='button urlfile' title='" . esc_attr($file) . "'>" . __('File URL') . "</button>
+        <button type='button' class='button urlpost' title='" . esc_attr($link) . "'>" . __('Post URL') . "</button>
 ";
 }
@@ -897 +913 @@
                 );
 
-                $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size') );
+                $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
 
         } else {