diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-17 13:54:55 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-17 13:54:55 +0000 |
| commit | 26b0392f7796ed87daa7725a33ac87057b3b2a4c (patch) | |
| tree | a2ca18226dc80a13acb617207228b73b10928125 /wp-admin | |
| parent | 72e9496bfc2f7a962cf4f428ccab25c7a0175aaa (diff) | |
| download | wordpress-mu-26b0392f7796ed87daa7725a33ac87057b3b2a4c.tar.gz wordpress-mu-26b0392f7796ed87daa7725a33ac87057b3b2a4c.tar.xz wordpress-mu-26b0392f7796ed87daa7725a33ac87057b3b2a4c.zip | |
WP Merge to rev 4759
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@850 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin')
| -rw-r--r-- | wp-admin/admin-functions.php | 2 | ||||
| -rw-r--r-- | wp-admin/user-edit.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 4f90c28..aa9fa78 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -2092,7 +2092,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { $max = apply_filters( 'wp_thumbnail_creation_size_limit', 3 * 1024 * 1024, $attachment_id, $file ); - if ( $max > 0 && $metadata['width'] * $metadata['height'] < $max ) { + if ( $max < 0 || $metadata['width'] * $metadata['height'] < $max ) { $max_side = apply_filters( 'wp_thumbnail_max_side_length', 128, $attachment_id, $file ); $thumb = wp_create_thumbnail( $file, $max_side ); diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 46c72d9..41fa9da 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -126,7 +126,7 @@ echo $role_list . '</select>'; <p><label><?php _e('Nickname:') ?><br /> <input type="text" name="nickname" value="<?php echo $profileuser->nickname ?>" /></label></p> -</p><label><?php _e('Display name publicly as:') ?> <br /> +<p><label><?php _e('Display name publicly as:') ?> <br /> <select name="display_name"> <option value="<?php echo $profileuser->display_name; ?>"><?php echo $profileuser->display_name; ?></option> <option value="<?php echo $profileuser->nickname ?>"><?php echo $profileuser->nickname ?></option> |