WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/wp-includes/general-template.php

    r5443 r5714  
    6464   
    6565    // Don't filter URL's.
    66     if (strpos($show, 'url') === false ||
    67         strpos($show, 'directory') === false ||
     66    if (strpos($show, 'url') === false &&
     67        strpos($show, 'directory') === false &&
    6868        strpos($show, 'home') === false) {
    6969        $info = apply_filters('bloginfo', $info, $show);
     
    110110        case 'comments_atom_url':
    111111            $output = get_feed_link('comments_atom');
     112            break;
    112113        case 'comments_rss2_url':
    113114            $output = get_feed_link('comments_rss2');
     
    218219    if ( is_single() || is_page() ) {
    219220        $post = $wp_query->get_queried_object();
    220         $title = apply_filters('single_post_title', $title);
    221         $title = strip_tags($post->post_title);
     221        $title = strip_tags( apply_filters( 'single_post_title', $post->post_title ) );
    222222    }
    223223
     
    323323    $defaults = array('type' => 'monthly', 'limit' => '', 'format' => 'html', 'before' => '', 'after' => '', 'show_post_count' => false);
    324324    $r = array_merge($defaults, $r);
    325     extract($r);
     325    extract($r, EXTR_SKIP);
    326326
    327327    if ( '' == $type )
     
    900900    edCanvas = document.getElementById('<?php echo $id; ?>');
    901901    <?php if ( $prev_id && user_can_richedit() ) : ?>
     902    // If tinyMCE is defined.
     903    if ( typeof tinyMCE != 'undefined' ) {
    902904    // This code is meant to allow tabbing from Title to Post (TinyMCE).
    903     if ( tinyMCE.isMSIE )
    904         document.getElementById('<?php echo $prev_id; ?>').onkeydown = function (e)
    905             {
     905        if ( tinyMCE.isMSIE ) {
     906            document.getElementById('<?php echo $prev_id; ?>').onkeydown = function (e) {
    906907                e = e ? e : window.event;
    907908                if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
     
    916917                }
    917918            }
    918     else
    919         document.getElementById('<?php echo $prev_id; ?>').onkeypress = function (e)
    920             {
     919        } else {
     920            document.getElementById('<?php echo $prev_id; ?>').onkeypress = function (e) {
    921921                e = e ? e : window.event;
    922922                if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
     
    931931                }
    932932            }
     933        }
     934    }
    933935    <?php endif; ?>
    934936    //-->
     
    956958}
    957959
    958 function paginate_links( $arg = '' ) {
    959     if ( is_array($arg) )
    960         $a = &$arg;
    961     else
    962         parse_str($arg, $a);
    963 
    964     // Defaults
    965     $base = '%_%'; // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
    966     $format = '?page=%#%'; // ?page=%#% : %#% is replaced by the page number
    967     $total = 1;
    968     $current = 0;
    969     $show_all = false;
    970     $prev_next = true;
    971     $prev_text = __('&laquo; Previous');
    972     $next_text = __('Next &raquo;');
    973     $end_size = 1; // How many numbers on either end including the end
    974     $mid_size = 2; // How many numbers to either side of current not including current
    975     $type = 'plain';
    976     $add_args = false; // array of query args to aadd
    977 
    978     extract($a);
     960function paginate_links( $args = '' ) {
     961    $defaults = array(
     962        'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
     963        'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
     964        'total' => 1,
     965        'current' => 0,
     966        'show_all' => false,
     967        'prev_next' => true,
     968        'prev_text' => __('&laquo; Previous'),
     969        'next_text' => __('Next &raquo;'),
     970        'end_size' => 1, // How many numbers on either end including the end
     971        'mid_size' => 2, // How many numbers to either side of current not including current
     972        'type' => 'plain',
     973        'add_args' => false // array of query args to aadd
     974    );
     975
     976    $args = wp_parse_args( $args, $defaults );
     977    extract($args, EXTR_SKIP);
    979978
    980979    // Who knows what else people pass in $args
Note: See TracChangeset for help on using the changeset viewer.