Wordpress 3.6

[autoinstalls/wordpress.git] / wp-includes / default-widgets.php

diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index bcbae03dee6d975e729c84fbd1b1976a9bb30790..09d5811f1c26fa8f22a9a9c505bcff8296be001f 100644 (file)
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -315,10 +315,11 @@ class WP_Widget_Meta extends WP_Widget {
                        <li><?php wp_loginout(); ?></li>
                        <li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php echo esc_attr(__('Syndicate this site using RSS 2.0')); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
                        <li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php echo esc_attr(__('The latest comments to all posts in RSS')); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-                       <li><a href="<?php esc_attr_e( 'http://wordpress.org/' ); ?>" title="<?php echo esc_attr(__('Powered by WordPress, state-of-the-art semantic personal publishing platform.')); ?>"><?php
-                       /* translators: meta widget link text */
-                       _e( 'WordPress.org' );
-                       ?></a></li>
+                       <?php echo apply_filters( 'widget_meta_poweredby', sprintf( '<li><a href="%s" title="%s">%s</a></li>',
+                               esc_url( __( 'http://wordpress.org/' ) ),
+                               esc_attr__( 'Powered by WordPress, state-of-the-art semantic personal publishing platform.' ),
+                               _x( 'WordPress.org', 'meta widget link text' )
+                       ) ); ?>
                        <?php wp_meta(); ?>
                        </ul>
 <?php
@@ -558,8 +559,10 @@ class WP_Widget_Recent_Posts extends WP_Widget {
                ob_start();
                extract($args);
 
-               $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title'], $instance, $this->id_base);
-               if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
+               $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Posts' );
+               $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+               $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 10;
+               if ( ! $number )
                        $number = 10;
                $show_date = isset( $instance['show_date'] ) ? $instance['show_date'] : false;
 
@@ -593,7 +596,7 @@ class WP_Widget_Recent_Posts extends WP_Widget {
                $instance = $old_instance;
                $instance['title'] = strip_tags($new_instance['title']);
                $instance['number'] = (int) $new_instance['number'];
-               $instance['show_date'] = (bool) $new_instance['show_date'];
+               $instance['show_date'] = isset( $new_instance['show_date'] ) ? (bool) $new_instance['show_date'] : false;
                $this->flush_widget_cache();
 
                $alloptions = wp_cache_get( 'alloptions', 'options' );
@@ -674,9 +677,11 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 
                extract($args, EXTR_SKIP);
                $output = '';
-               $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Recent Comments' ) : $instance['title'], $instance, $this->id_base );
 
-               if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
+               $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
+               $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+               $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
+               if ( ! $number )
                        $number = 5;
 
                $comments = get_comments( apply_filters( 'widget_comments_args', array( 'number' => $number, 'status' => 'approve', 'post_status' => 'publish' ) ) );
@@ -716,14 +721,14 @@ class WP_Widget_Recent_Comments extends WP_Widget {
        }
 
        function form( $instance ) {
-               $title = isset($instance['title']) ? esc_attr($instance['title']) : '';
-               $number = isset($instance['number']) ? absint($instance['number']) : 5;
+               $title  = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+               $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
 ?>
-               <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
-               <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" /></p>
+               <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
+               <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></p>
 
-               <p><label for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of comments to show:'); ?></label>
-               <input id="<?php echo $this->get_field_id('number'); ?>" name="<?php echo $this->get_field_name('number'); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
+               <p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of comments to show:' ); ?></label>
+               <input id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
 <?php
        }
 }
@@ -861,18 +866,18 @@ function wp_widget_rss_output( $rss, $args = array() ) {
                        $title = __('Untitled');
 
                $desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) );
-               $desc = wp_html_excerpt( $desc, 360 );
+               $excerpt = wp_html_excerpt( $desc, 360 );
 
                // Append ellipsis. Change existing [...] to [&hellip;].
-               if ( '[...]' == substr( $desc, -5 ) )
-                       $desc = substr( $desc, 0, -5 ) . '[&hellip;]';
-               elseif ( '[&hellip;]' != substr( $desc, -10 ) )
-                       $desc .= ' [&hellip;]';
+               if ( '[...]' == substr( $excerpt, -5 ) )
+                       $excerpt = substr( $excerpt, 0, -5 ) . '[&hellip;]';
+               elseif ( '[&hellip;]' != substr( $excerpt, -10 ) && $desc != $excerpt )
+                       $excerpt .= ' [&hellip;]';
 
-               $desc = esc_html( $desc );
+               $excerpt = esc_html( $excerpt );
 
                if ( $show_summary ) {
-                       $summary = "<div class='rssSummary'>$desc</div>";
+                       $summary = "<div class='rssSummary'>$excerpt</div>";
                } else {
                        $summary = '';
                }