WordPress.org
Get WordPress

Make WordPress Core

Changeset 11188


Ignore:
Timestamp:
05/05/2009 03:59:08 AM (17 years ago)
Author:
ryan
Message:

always apply widget_title filter. Props Denis-de-Bernardy. fixes #9450

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-includes/default-widgets.php

    r11173 r11188  
    2323        extract( $args );
    2424
    25         $title = empty( $instance['title'] ) ? __( 'Pages' ) : apply_filters('widget_title', $instance['title']);
     25        $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Pages' ) : $instance['title']);
    2626        $sortby = empty( $instance['sortby'] ) ? 'menu_order' : $instance['sortby'];
    2727        $exclude = empty( $instance['exclude'] ) ? '' : $instance['exclude'];
    … …  
    3434        if ( !empty( $out ) ) {
    3535            echo $before_widget;
    36             echo $before_title . $title . $after_title;
     36            if ( $title)
     37                echo $before_title . $title . $after_title;
    3738        ?>
    3839        <ul>
    … …  
    204205        $c = $instance['count'] ? '1' : '0';
    205206        $d = $instance['dropdown'] ? '1' : '0';
    206         $title = empty($instance['title']) ? __('Archives') : apply_filters('widget_title', $instance['title']);
     207        $title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title']);
    207208
    208209        echo $before_widget;
    209         echo $before_title . $title . $after_title;
     210        if ( $title )
     211            echo $before_title . $title . $after_title;
    210212
    211213        if ( $d ) {
    … …  
    266268    function widget( $args, $instance ) {
    267269        extract($args);
    268         $title = empty($instance['title']) ? __('Meta') : apply_filters('widget_title', $instance['title']);
     270        $title = apply_filters('widget_title', empty($instance['title']) ? __('Meta') : $instance['title']);
    269271
    270272        echo $before_widget;
    271         echo $before_title . $title . $after_title;
     273        if ( $title )
     274            echo $before_title . $title . $after_title;
    272275?>
    273276            <ul>
    … …  
    313316    function widget( $args, $instance ) {
    314317        extract($args);
    315         $title = empty($instance['title']) ? '&nbsp;' : apply_filters('widget_title', $instance['title']);
    316         echo $before_widget . $before_title . $title . $after_title;
     318        $title = apply_filters('widget_title', empty($instance['title']) ? '&nbsp;' : $instance['title']);
     319        echo $before_widget;
     320        if ( $title )
     321            echo $before_title . $title . $after_title;
    317322        echo '<div id="calendar_wrap">';
    318323        get_calendar();
    … …  
    355360    function widget( $args, $instance ) {
    356361        extract($args);
    357         $title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
     362        $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title']);
    358363        $text = apply_filters( 'widget_text', $instance['text'] );
    359364        echo $before_widget;
    … …  
    409414        extract( $args );
    410415
    411         $title = empty( $instance['title'] ) ? __( 'Categories' ) : apply_filters('widget_title', $instance['title']);
     416        $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title']);
    412417        $c = $instance['count'] ? '1' : '0';
    413418        $h = $instance['hierarchical'] ? '1' : '0';
    … …  
    415420
    416421        echo $before_widget;
    417         echo $before_title . $title . $after_title;
     422        if ( $title )
     423            echo $before_title . $title . $after_title;
    418424
    419425        $cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
    … …  
    522528        extract($args);
    523529
    524         $title = empty($instance['title']) ? __('Recent Posts') : apply_filters('widget_title', $instance['title']);
     530        $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title']);
    525531        if ( !$number = (int) $instance['number'] )
    526532            $number = 10;
    … …  
    534540?>
    535541        <?php echo $before_widget; ?>
    536         <?php echo $before_title . $title . $after_title; ?>
     542        <?php if ( $title ) echo $before_title . $title . $after_title; ?>
    537543        <ul>
    538544        <?php  while ($r->have_posts()) : $r->the_post(); ?>
    … …  
    615621
    616622        extract($args, EXTR_SKIP);
    617         $title = empty($instance['title']) ? __('Recent Comments') : apply_filters('widget_title', $instance['title']);
     623        $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Comments') : $instance['title']);
    618624        if ( !$number = (int) $instance['number'] )
    619625            $number = 5;
    … …  
    631637?>
    632638        <?php echo $before_widget; ?>
    633             <?php echo $before_title . $title . $after_title; ?>
     639            <?php if ( $title ) echo $before_title . $title . $after_title; ?>
    634640            <ul id="recentcomments"><?php
    635641            if ( $comments ) : foreach ( (array) $comments as $comment) :
    … …  
    717723        $url = clean_url(strip_tags($url));
    718724        $icon = includes_url('images/rss.png');
    719         $title = "<a class='rsswidget' href='$url' title='" . attr(__('Syndicate this content')) ."'><img style='background:orange;color:white;border:none;' width='14' height='14' src='$icon' alt='RSS' /></a> <a class='rsswidget' href='$link' title='$desc'>$title</a>";
     725        if ( $title )
     726            $title = "<a class='rsswidget' href='$url' title='" . attr(__('Syndicate this content')) ."'><img style='background:orange;color:white;border:none;' width='14' height='14' src='$icon' alt='RSS' /></a> <a class='rsswidget' href='$link' title='$desc'>$title</a>";
    720727
    721728        echo $before_widget;
    722         echo $before_title . $title . $after_title;
     729        if ( $title )
     730            echo $before_title . $title . $after_title;
    723731        wp_widget_rss_output( $rss, $instance );
    724732        echo $after_widget;
    … …  
    968976    function widget( $args, $instance ) {
    969977        extract($args);
    970         $title = empty($instance['title']) ? __('Tags') : apply_filters('widget_title', $instance['title']);
     978        $title = apply_filters('widget_title', empty($instance['title']) ? __('Tags') : $instance['title']);
    971979
    972980        echo $before_widget;
    973         echo $before_title . $title . $after_title;
     981        if ( $title )
     982            echo $before_title . $title . $after_title;
    974983        wp_tag_cloud();
    975984        echo $after_widget;
Note: See TracChangeset for help on using the changeset viewer.