Changeset 850

Show
Ignore:
Timestamp:
01/17/07 13:54:55 (2 years ago)
Author:
donncha
Message:

WP Merge to rev 4759

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/admin-functions.php

    r849 r850  
    20932093                $max = apply_filters( 'wp_thumbnail_creation_size_limit', 3 * 1024 * 1024, $attachment_id, $file ); 
    20942094 
    2095                 if ( $max > 0 && $metadata['width'] * $metadata['height'] < $max ) { 
     2095                if ( $max < 0 || $metadata['width'] * $metadata['height'] < $max ) { 
    20962096                        $max_side = apply_filters( 'wp_thumbnail_max_side_length', 128, $attachment_id, $file ); 
    20972097                        $thumb = wp_create_thumbnail( $file, $max_side ); 

  • trunk/wp-admin/user-edit.php

    r828 r850  
    127127<input type="text" name="nickname" value="<?php echo $profileuser->nickname ?>" /></label></p> 
    128128 
    129 </p><label><?php _e('Display name publicly as:') ?> <br /> 
     129<p><label><?php _e('Display name publicly as:') ?> <br /> 
    130130<select name="display_name"> 
    131131<option value="<?php echo $profileuser->display_name; ?>"><?php echo $profileuser->display_name; ?></option> 

  • trunk/wp-content/themes/classic/header.php

    r810 r850  
    11<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    2 <html xmlns="http://www.w3.org/1999/xhtml"> 
     2<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> 
    33 
    44<head profile="http://gmpg.org/xfn/11"> 

  • trunk/wp-content/themes/default/header.php

    r810 r850  
    11<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    2 <html xmlns="http://www.w3.org/1999/xhtml"> 
     2<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> 
    33 
    44<head profile="http://gmpg.org/xfn/11"> 

  • trunk/wp-includes/category-template.php

    r835 r850  
    259259                $output .= '</ul></li>'; 
    260260 
    261         echo apply_filters('list_cats', $output); 
     261        echo apply_filters('wp_list_categories', $output); 
    262262} 
    263263 

  • trunk/wp-includes/query.php

    r823 r850  
    805805                                if ( strlen($out_posts) > 0 ) 
    806806                                        $out_cats = " AND ID NOT IN ($out_posts)"; 
     807                                else 
     808                                        $out_cats = ''; 
    807809                        } 
    808810                        $whichcat = $in_cats . $out_cats;