X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/1c09677af04c9e37714e09b73eb9dbc5b2e3eb13..9c2096d803812dacbdf6cf8efe90053e39f00b96:/wp-includes/default-widgets.php?ds=sidebyside
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index 6dcf8225..df7ef39a 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -1,5 +1,4 @@
'widget_pages', 'description' => __( 'Your blog’s WordPress Pages') );
- $this->WP_Widget('pages', __('Pages'), $widget_ops);
+ function __construct() {
+ $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your site’s WordPress Pages') );
+ parent::__construct('pages', __('Pages'), $widget_ops);
}
function widget( $args, $instance ) {
extract( $args );
- $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Pages' ) : $instance['title']);
+ $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Pages' ) : $instance['title'], $instance, $this->id_base);
$sortby = empty( $instance['sortby'] ) ? 'menu_order' : $instance['sortby'];
$exclude = empty( $instance['exclude'] ) ? '' : $instance['exclude'];
@@ -90,9 +89,9 @@ class WP_Widget_Pages extends WP_Widget {
*/
class WP_Widget_Links extends WP_Widget {
- function WP_Widget_Links() {
+ function __construct() {
$widget_ops = array('description' => __( "Your blogroll" ) );
- $this->WP_Widget('links', __('Links'), $widget_ops);
+ parent::__construct('links', __('Links'), $widget_ops);
}
function widget( $args, $instance ) {
@@ -106,7 +105,7 @@ class WP_Widget_Links extends WP_Widget {
if ( is_admin() && !$category ) {
// Display All Links widget as such in the widgets screen
- echo $before_widget . $before_title. __('All Links') . $after_title . $after_widget;
+ echo $before_widget . $before_title . _x('All Links', 'links widget') . $after_title . $after_widget;
return;
}
@@ -141,7 +140,7 @@ class WP_Widget_Links extends WP_Widget {
/>
-
+
/>
@@ -510,9 +509,9 @@ class WP_Widget_Categories extends WP_Widget {
*/
class WP_Widget_Recent_Posts extends WP_Widget {
- function WP_Widget_Recent_Posts() {
- $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") );
- $this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops);
+ function __construct() {
+ $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your site") );
+ parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
$this->alt_option_name = 'widget_recent_entries';
add_action( 'save_post', array(&$this, 'flush_widget_cache') );
@@ -526,39 +525,40 @@ class WP_Widget_Recent_Posts extends WP_Widget {
if ( !is_array($cache) )
$cache = array();
- if ( isset($cache[$args['widget_id']]) ) {
- echo $cache[$args['widget_id']];
+ if ( ! isset( $args['widget_id'] ) )
+ $args['widget_id'] = $this->id;
+
+ if ( isset( $cache[ $args['widget_id'] ] ) ) {
+ echo $cache[ $args['widget_id'] ];
return;
}
ob_start();
extract($args);
- $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title']);
- if ( !$number = (int) $instance['number'] )
- $number = 10;
- else if ( $number < 1 )
- $number = 1;
- else if ( $number > 15 )
- $number = 15;
+ $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title'], $instance, $this->id_base);
+ if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
+ $number = 10;
- $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1));
+ $r = new WP_Query(array('posts_per_page' => $number, 'no_found_rows' => true, 'post_status' => 'publish', 'ignore_sticky_posts' => true));
if ($r->have_posts()) :
?>
have_posts()) : $r->the_post(); ?>
- -
+
-
-
+
'widget_recent_comments', 'description' => __( 'The most recent comments' ) );
- $this->WP_Widget('recent-comments', __('Recent Comments'), $widget_ops);
+ parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
$this->alt_option_name = 'widget_recent_comments';
if ( is_active_widget(false, false, $this->id_base) )
@@ -612,48 +610,65 @@ class WP_Widget_Recent_Comments extends WP_Widget {
add_action( 'transition_comment_status', array(&$this, 'flush_widget_cache') );
}
- function recent_comments_style() { ?>
+ function recent_comments_style() {
+ if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
+ || ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
+ return;
+ ?>
15 )
- $number = 15;
-
- if ( !$comments = wp_cache_get( 'recent_comments', 'widget' ) ) {
- $comments = $wpdb->get_results("SELECT $wpdb->comments.* FROM $wpdb->comments JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID WHERE comment_approved = '1' AND post_status = 'publish' ORDER BY comment_date_gmt DESC LIMIT 15");
- wp_cache_add( 'recent_comments', $comments, 'widget' );
+ $cache = wp_cache_get('widget_recent_comments', 'widget');
+
+ if ( ! is_array( $cache ) )
+ $cache = array();
+
+ if ( ! isset( $args['widget_id'] ) )
+ $args['widget_id'] = $this->id;
+
+ if ( isset( $cache[ $args['widget_id'] ] ) ) {
+ echo $cache[ $args['widget_id'] ];
+ return;
}
- $comments = array_slice( (array) $comments, 0, $number );
-?>
-
-
-
-
-id_base );
+
+ if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
+ $number = 5;
+
+ $comments = get_comments( array( 'number' => $number, 'status' => 'approve', 'post_status' => 'publish' ) );
+ $output .= $before_widget;
+ if ( $title )
+ $output .= $before_title . $title . $after_title;
+
+ $output .= '';
+ $output .= $after_widget;
+
+ echo $output;
+ $cache[$args['widget_id']] = $output;
+ wp_cache_set('widget_recent_comments', $cache, 'widget');
}
function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
- $instance['number'] = (int) $new_instance['number'];
+ $instance['number'] = absint( $new_instance['number'] );
$this->flush_widget_cache();
$alloptions = wp_cache_get( 'alloptions', 'options' );
@@ -671,8 +686,7 @@ class WP_Widget_Recent_Comments extends WP_Widget {
-
-
+
__('Entries from any RSS or Atom feed') );
$control_ops = array( 'width' => 400, 'height' => 200 );
- $this->WP_Widget( 'rss', __('RSS'), $widget_ops, $control_ops );
+ parent::__construct( 'rss', __('RSS'), $widget_ops, $control_ops );
}
function widget($args, $instance) {
@@ -697,13 +711,17 @@ class WP_Widget_RSS extends WP_Widget {
extract($args, EXTR_SKIP);
- $url = $instance['url'];
+ $url = ! empty( $instance['url'] ) ? $instance['url'] : '';
while ( stristr($url, 'http') != $url )
$url = substr($url, 1);
if ( empty($url) )
return;
+ // self-url destruction sequence
+ if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) )
+ return;
+
$rss = fetch_feed($url);
$title = $instance['title'];
$desc = '';
@@ -721,23 +739,25 @@ class WP_Widget_RSS extends WP_Widget {
if ( empty($title) )
$title = empty($desc) ? __('Unknown Feed') : $desc;
- $title = apply_filters('widget_title', $title );
+ $title = apply_filters('widget_title', $title, $instance, $this->id_base);
$url = esc_url(strip_tags($url));
$icon = includes_url('images/rss.png');
if ( $title )
- $title = " ";
+ $title = " ";
echo $before_widget;
if ( $title )
echo $before_title . $title . $after_title;
wp_widget_rss_output( $rss, $instance );
echo $after_widget;
- $rss->__destruct();
+
+ if ( ! is_wp_error($rss) )
+ $rss->__destruct();
unset($rss);
}
function update($new_instance, $old_instance) {
- $testurl = $new_instance['url'] != $old_instance['url'];
+ $testurl = ( isset( $new_instance['url'] ) && ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) );
return wp_widget_rss_process( $new_instance, $testurl );
}
@@ -788,7 +808,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( !$rss->get_item_quantity() ) {
echo '- ' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '
';
- $rss->__destruct();
+ $rss->__destruct();
unset($rss);
return;
}
@@ -803,8 +823,15 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( empty($title) )
$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 ) . ' […]';
+ $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 );
+
+ // Append ellipsis. Change existing [...] to […].
+ if ( '[...]' == substr( $desc, -5 ) )
+ $desc = substr( $desc, 0, -5 ) . '[…]';
+ elseif ( '[…]' != substr( $desc, -10 ) )
+ $desc .= ' […]';
+
$desc = esc_html( $desc );
if ( $show_summary ) {
@@ -815,13 +842,10 @@ function wp_widget_rss_output( $rss, $args = array() ) {
$date = '';
if ( $show_date ) {
- $date = $item->get_date();
+ $date = $item->get_date( 'U' );
if ( $date ) {
- if ( $date_stamp = strtotime( $date ) )
- $date = ' ';
- else
- $date = '';
+ $date = ' ';
}
}
@@ -841,7 +865,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
}
}
echo '';
- $rss->__destruct();
+ $rss->__destruct();
unset($rss);
}
@@ -937,9 +961,9 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
$items = 10;
$url = esc_url_raw(strip_tags( $widget_rss['url'] ));
$title = trim(strip_tags( $widget_rss['title'] ));
- $show_summary = (int) $widget_rss['show_summary'];
- $show_author = (int) $widget_rss['show_author'];
- $show_date = (int) $widget_rss['show_date'];
+ $show_summary = isset($widget_rss['show_summary']) ? (int) $widget_rss['show_summary'] : 0;
+ $show_author = isset($widget_rss['show_author']) ? (int) $widget_rss['show_author'] :0;
+ $show_date = isset($widget_rss['show_date']) ? (int) $widget_rss['show_date'] : 0;
if ( $check_feed ) {
$rss = fetch_feed($url);
@@ -967,34 +991,132 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
*/
class WP_Widget_Tag_Cloud extends WP_Widget {
- function WP_Widget_Tag_Cloud() {
+ function __construct() {
$widget_ops = array( 'description' => __( "Your most used tags in cloud format") );
- $this->WP_Widget('tag_cloud', __('Tag Cloud'), $widget_ops);
+ parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
}
function widget( $args, $instance ) {
extract($args);
- $title = apply_filters('widget_title', empty($instance['title']) ? __('Tags') : $instance['title']);
+ $current_taxonomy = $this->_get_current_taxonomy($instance);
+ if ( !empty($instance['title']) ) {
+ $title = $instance['title'];
+ } else {
+ if ( 'post_tag' == $current_taxonomy ) {
+ $title = __('Tags');
+ } else {
+ $tax = get_taxonomy($current_taxonomy);
+ $title = $tax->labels->name;
+ }
+ }
+ $title = apply_filters('widget_title', $title, $instance, $this->id_base);
echo $before_widget;
if ( $title )
echo $before_title . $title . $after_title;
- echo '';
- wp_tag_cloud(apply_filters('widget_tag_cloud_args', array()));
+ echo '
';
+ wp_tag_cloud( apply_filters('widget_tag_cloud_args', array('taxonomy' => $current_taxonomy) ) );
echo "
\n";
echo $after_widget;
}
function update( $new_instance, $old_instance ) {
$instance['title'] = strip_tags(stripslashes($new_instance['title']));
+ $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
return $instance;
}
function form( $instance ) {
+ $current_taxonomy = $this->_get_current_taxonomy($instance);
?>
-
+
__('Use this widget to add one of your custom menus as a widget.') );
+ parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
+ }
+
+ function widget($args, $instance) {
+ // Get menu
+ $nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false;
+
+ if ( !$nav_menu )
+ return;
+
+ $instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+
+ echo $args['before_widget'];
+
+ if ( !empty($instance['title']) )
+ echo $args['before_title'] . $instance['title'] . $args['after_title'];
+
+ wp_nav_menu( array( 'fallback_cb' => '', 'menu' => $nav_menu ) );
+
+ echo $args['after_widget'];
+ }
+
+ function update( $new_instance, $old_instance ) {
+ $instance['title'] = strip_tags( stripslashes($new_instance['title']) );
+ $instance['nav_menu'] = (int) $new_instance['nav_menu'];
+ return $instance;
+ }
+
+ function form( $instance ) {
+ $title = isset( $instance['title'] ) ? $instance['title'] : '';
+ $nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
+
+ // Get menus
+ $menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
+
+ // If no menus exists, direct the user to go and create some.
+ if ( !$menus ) {
+ echo '
'. sprintf( __('No menus have been created yet. Create some.'), admin_url('nav-menus.php') ) .'
';
+ return;
+ }
+ ?>
+
+
+
+
+
+
+
+
+