Ticket #19838: default-widgets-19838.diff

wp-includes/default-widgets.php

@@ -32 +32 @@
 
                 if ( !empty( $out ) ) {
                         echo $before_widget;
-                        if ( $title)
-                                echo $before_title . $title . $after_title;
-                ?>
+                        if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?>
                 <ul>
                         <?php echo $out; ?>
                 </ul>
@@ -180 +178 @@
                 $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
 
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }
 
                 // Use current theme search form if it exists
                 get_search_form();
@@ -225 +222 @@
                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title'], $instance, $this->id_base);
 
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }
 
                 if ( $d ) {
 ?>
@@ -288 +284 @@
                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Meta') : $instance['title'], $instance, $this->id_base);
 
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
-?>
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?>
                         <ul>
                         <?php wp_register(); ?>
                         <li><?php wp_loginout(); ?></li>
@@ -335 +329 @@
                 extract($args);
                 $title = apply_filters('widget_title', empty($instance['title']) ? '&nbsp;' : $instance['title'], $instance, $this->id_base);
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }
                 echo '<div id="calendar_wrap">';
                 get_calendar();
                 echo '</div>';
@@ -431 +424 @@
                 $d = ! empty( $instance['dropdown'] ) ? '1' : '0';
 
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }
 
                 $cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
 
@@ -648 +640 @@
 
                 $comments = get_comments( array( 'number' => $number, 'status' => 'approve', 'post_status' => 'publish' ) );
                 $output .= $before_widget;
-                if ( $title )
-                        $output .= $before_title . $title . $after_title;
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }
 
                 $output .= '<ul id="recentcomments">';
                 if ( $comments ) {
@@ -746 +737 @@
                         $title = "<a class='rsswidget' href='$url' title='" . esc_attr__( 'Syndicate this content' ) ."'><img style='border:0' width='14' height='14' src='$icon' alt='RSS' /></a> <a class='rsswidget' href='$link' title='$desc'>$title</a>";
 
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }
                 wp_widget_rss_output( $rss, $instance );
                 echo $after_widget;
 
@@ -1010 +1000 @@
                 $title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
+                if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }
                 echo '<div class="tagcloud">';
                 wp_tag_cloud( apply_filters('widget_tag_cloud_args', array('taxonomy' => $current_taxonomy) ) );
                 echo "</div>\n";