diff options
| -rw-r--r-- | wp-admin/admin-functions.php | 2 | ||||
| -rw-r--r-- | wp-admin/user-edit.php | 2 | ||||
| -rw-r--r-- | wp-content/themes/classic/header.php | 2 | ||||
| -rw-r--r-- | wp-content/themes/default/header.php | 2 | ||||
| -rw-r--r-- | wp-includes/category-template.php | 2 | ||||
| -rw-r--r-- | wp-includes/query.php | 2 |
6 files changed, 7 insertions, 5 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> diff --git a/wp-content/themes/classic/header.php b/wp-content/themes/classic/header.php index 92c995f..2c02a89 100644 --- a/wp-content/themes/classic/header.php +++ b/wp-content/themes/classic/header.php @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> <head profile="http://gmpg.org/xfn/11"> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> diff --git a/wp-content/themes/default/header.php b/wp-content/themes/default/header.php index 774d6d2..2251f23 100644 --- a/wp-content/themes/default/header.php +++ b/wp-content/themes/default/header.php @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> <head profile="http://gmpg.org/xfn/11"> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index f1a8346..b5954c5 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -258,7 +258,7 @@ function wp_list_categories($args = '') { if ( $title_li && 'list' == $style ) $output .= '</ul></li>'; - echo apply_filters('list_cats', $output); + echo apply_filters('wp_list_categories', $output); } // diff --git a/wp-includes/query.php b/wp-includes/query.php index 05f424d..04a07df 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -804,6 +804,8 @@ class WP_Query { }
if ( strlen($out_posts) > 0 )
$out_cats = " AND ID NOT IN ($out_posts)";
+ else
+ $out_cats = '';
}
$whichcat = $in_cats . $out_cats;
$groupby = "{$wpdb->posts}.ID";
|