X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/baca9ce86a38dc54c4574890ee2d352fd81f78b2..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-includes/default-widgets.php
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index bcbae03d..09d5811f 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -315,10 +315,11 @@ class WP_Widget_Meta extends WP_Widget {
RSS'); ?>
RSS'); ?>
-
+ %s',
+ 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' )
+ ) ); ?>
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;
?>
-
-
+
+
-
-
+
+
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 […].
- if ( '[...]' == substr( $desc, -5 ) )
- $desc = substr( $desc, 0, -5 ) . '[…]';
- elseif ( '[…]' != substr( $desc, -10 ) )
- $desc .= ' […]';
+ if ( '[...]' == substr( $excerpt, -5 ) )
+ $excerpt = substr( $excerpt, 0, -5 ) . '[…]';
+ elseif ( '[…]' != substr( $excerpt, -10 ) && $desc != $excerpt )
+ $excerpt .= ' […]';
- $desc = esc_html( $desc );
+ $excerpt = esc_html( $excerpt );
if ( $show_summary ) {
- $summary = "";
+ $summary = "";
} else {
$summary = '';
}