Changeset 894

Show
Ignore:
Timestamp:
02/21/07 11:12:52 (2 years ago)
Author:
donncha
Message:

WP Merge to rev 4904

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r810 r894  
    8989<?php endif; ?> 
    9090 
    91 <!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>--> 
     91<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>--> 
    9292 
    9393<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p> 

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

    r888 r894  
    7575 
    7676        if ( !empty($categories) ) 
    77                 sort($categories); 
     77                usort($categories, '_get_the_category_usort'); 
    7878        else 
    7979                $categories = array(); 
    8080 
    8181        return $categories; 
     82} 
     83 
     84function _get_the_category_usort($a, $b) { 
     85        return strcmp($a->category_name, $b->category_name); 
    8286} 
    8387 

  • trunk/wp-includes/formatting.php

    r890 r894  
    5757        $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee); 
    5858        // Space things out a little 
    59         $allblocks = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|style|script|object|input|param|p|h[1-6])'; 
     59        $allblocks = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|script|object|input|param|p|h[1-6])'; 
    6060        $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee); 
    6161        $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee); 

  • trunk/wp-includes/script-loader.php

    r890 r894  
    3131                $this->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.7.0'); 
    3232                $this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118'); 
     33                $this->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.1.1'); 
     34                $this->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.1.1'); 
    3335                if ( is_admin() ) { 
    3436                        $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' ); 
    …… 
    4042                        $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' ); 
    4143                        $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20070118' ); 
    42                         $this->add( 'jquery', '/wp-includes/js/jquery-latest.pack.js', false, '1.0.3' ); 
    4344                } 
    4445        }