X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/16b9f61a8ab25bd6c9fbfd0cea00c7bda22f6a71..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-includes/default-widgets.php diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php index e5219fec..09d5811f 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 ) { @@ -103,12 +102,9 @@ class WP_Widget_Links extends WP_Widget { $show_rating = isset($instance['rating']) ? $instance['rating'] : false; $show_images = isset($instance['images']) ? $instance['images'] : true; $category = isset($instance['category']) ? $instance['category'] : false; - - 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; - return; - } + $orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name'; + $order = $orderby == 'rating' ? 'DESC' : 'ASC'; + $limit = isset( $instance['limit'] ) ? $instance['limit'] : -1; $before_widget = preg_replace('/id="[^"]*"/','id="%id"', $before_widget); wp_list_bookmarks(apply_filters('widget_links_args', array( @@ -116,18 +112,26 @@ class WP_Widget_Links extends WP_Widget { 'category_before' => $before_widget, 'category_after' => $after_widget, 'show_images' => $show_images, 'show_description' => $show_description, 'show_name' => $show_name, 'show_rating' => $show_rating, - 'category' => $category, 'class' => 'linkcat widget' + 'category' => $category, 'class' => 'linkcat widget', + 'orderby' => $orderby, 'order' => $order, + 'limit' => $limit, ))); } function update( $new_instance, $old_instance ) { $new_instance = (array) $new_instance; - $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0); + $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 ); foreach ( $instance as $field => $val ) { if ( isset($new_instance[$field]) ) $instance[$field] = 1; } - $instance['category'] = intval($new_instance['category']); + + $instance['orderby'] = 'name'; + if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) ) + $instance['orderby'] = $new_instance['orderby']; + + $instance['category'] = intval( $new_instance['category'] ); + $instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1; return $instance; } @@ -135,21 +139,31 @@ class WP_Widget_Links extends WP_Widget { function form( $instance ) { //Defaults - $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false ) ); - $link_cats = get_terms( 'link_category'); + $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) ); + $link_cats = get_terms( 'link_category' ); + if ( ! $limit = intval( $instance['limit'] ) ) + $limit = -1; ?>

- +

+ + + +

id="get_field_id('images'); ?>" name="get_field_name('images'); ?>" />
@@ -160,6 +174,10 @@ class WP_Widget_Links extends WP_Widget { id="get_field_id('rating'); ?>" name="get_field_name('rating'); ?>" />

+

+ + +

'widget_search', 'description' => __( "A search form for your blog") ); - $this->WP_Widget('search', __('Search'), $widget_ops); + function __construct() { + $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site") ); + parent::__construct('search', __('Search'), $widget_ops); } function widget( $args, $instance ) { extract($args); - $title = apply_filters('widget_title', $instance['title']); + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); echo $before_widget; if ( $title ) @@ -214,16 +232,16 @@ class WP_Widget_Search extends WP_Widget { */ class WP_Widget_Archives extends WP_Widget { - function WP_Widget_Archives() { - $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your blog’s posts') ); - $this->WP_Widget('archives', __('Archives'), $widget_ops); + function __construct() { + $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site’s posts') ); + parent::__construct('archives', __('Archives'), $widget_ops); } function widget( $args, $instance ) { extract($args); - $c = $instance['count'] ? '1' : '0'; - $d = $instance['dropdown'] ? '1' : '0'; - $title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title']); + $c = ! empty( $instance['count'] ) ? '1' : '0'; + $d = ! empty( $instance['dropdown'] ) ? '1' : '0'; + $title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title'], $instance, $this->id_base); echo $before_widget; if ( $title ) @@ -262,9 +280,9 @@ class WP_Widget_Archives extends WP_Widget { ?>

+ id="get_field_id('dropdown'); ?>" name="get_field_name('dropdown'); ?>" /> +
id="get_field_id('count'); ?>" name="get_field_name('count'); ?>" /> -
- id="get_field_id('dropdown'); ?>" name="get_field_name('dropdown'); ?>" />

'widget_meta', 'description' => __( "Log in/out, admin, feed and WordPress links") ); - $this->WP_Widget('meta', __('Meta'), $widget_ops); + parent::__construct('meta', __('Meta'), $widget_ops); } function widget( $args, $instance ) { extract($args); - $title = apply_filters('widget_title', empty($instance['title']) ? __('Meta') : $instance['title']); + $title = apply_filters('widget_title', empty($instance['title']) ? __('Meta') : $instance['title'], $instance, $this->id_base); echo $before_widget; if ( $title ) @@ -297,7 +315,11 @@ class WP_Widget_Meta extends WP_Widget {
  • RSS'); ?>
  • RSS'); ?>
    • -
  • WordPress.org
    • + %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' ) + ) ); ?> 'widget_calendar', 'description' => __( 'A calendar of your blog’s posts') ); - $this->WP_Widget('calendar', __('Calendar'), $widget_ops); + function __construct() { + $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site’s posts') ); + parent::__construct('calendar', __('Calendar'), $widget_ops); } function widget( $args, $instance ) { extract($args); - $title = apply_filters('widget_title', empty($instance['title']) ? ' ' : $instance['title']); + $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; @@ -368,19 +390,19 @@ class WP_Widget_Calendar extends WP_Widget { */ class WP_Widget_Text extends WP_Widget { - function WP_Widget_Text() { + function __construct() { $widget_ops = array('classname' => 'widget_text', 'description' => __('Arbitrary text or HTML')); $control_ops = array('width' => 400, 'height' => 350); - $this->WP_Widget('text', __('Text'), $widget_ops, $control_ops); + parent::__construct('text', __('Text'), $widget_ops, $control_ops); } function widget( $args, $instance ) { extract($args); - $title = apply_filters( 'widget_title', empty($instance['title']) ? '' : $instance['title'], $instance ); - $text = apply_filters( 'widget_text', $instance['text'], $instance ); + $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); + $text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance ); echo $before_widget; if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?> -
    +
    '', 'text' => '' ) ); $title = strip_tags($instance['title']); - $text = format_to_edit($instance['text']); + $text = esc_textarea($instance['text']); ?>

    -

    /> 

    +

    /> 

    'widget_categories', 'description' => __( "A list or dropdown of categories" ) ); - $this->WP_Widget('categories', __('Categories'), $widget_ops); + parent::__construct('categories', __('Categories'), $widget_ops); } function widget( $args, $instance ) { extract( $args ); - $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title']); - $c = $instance['count'] ? '1' : '0'; - $h = $instance['hierarchical'] ? '1' : '0'; - $d = $instance['dropdown'] ? '1' : '0'; + $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base); + $c = ! empty( $instance['count'] ) ? '1' : '0'; + $h = ! empty( $instance['hierarchical'] ) ? '1' : '0'; + $d = ! empty( $instance['dropdown'] ) ? '1' : '0'; echo $before_widget; if ( $title ) @@ -447,7 +469,7 @@ class WP_Widget_Categories extends WP_Widget { var dropdown = document.getElementById("cat"); function onCatChange() { if ( dropdown.options[dropdown.selectedIndex].value > 0 ) { - location.href = "/?cat="+dropdown.options[dropdown.selectedIndex].value; + location.href = "/?cat="+dropdown.options[dropdown.selectedIndex].value; } } dropdown.onchange = onCatChange; @@ -472,9 +494,9 @@ class WP_Widget_Categories extends WP_Widget { function update( $new_instance, $old_instance ) { $instance = $old_instance; $instance['title'] = strip_tags($new_instance['title']); - $instance['count'] = $new_instance['count'] ? 1 : 0; - $instance['hierarchical'] = $new_instance['hierarchical'] ? 1 : 0; - $instance['dropdown'] = $new_instance['dropdown'] ? 1 : 0; + $instance['count'] = !empty($new_instance['count']) ? 1 : 0; + $instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0; + $instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0; return $instance; } @@ -491,7 +513,7 @@ class WP_Widget_Categories extends WP_Widget {

    /> -
    +
    />
    @@ -510,14 +532,14 @@ 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') ); - add_action( 'deleted_post', array(&$this, 'flush_widget_cache') ); - add_action( 'switch_theme', array(&$this, 'flush_widget_cache') ); + add_action( 'save_post', array($this, 'flush_widget_cache') ); + add_action( 'deleted_post', array($this, 'flush_widget_cache') ); + add_action( 'switch_theme', array($this, 'flush_widget_cache') ); } function widget($args, $instance) { @@ -526,45 +548,55 @@ 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 = ( ! 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; - $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1)); + $r = new WP_Query( apply_filters( 'widget_posts_args', array( 'posts_per_page' => $number, 'no_found_rows' => true, 'post_status' => 'publish', 'ignore_sticky_posts' => true ) ) ); if ($r->have_posts()) : ?>

    flush_widget_cache(); $alloptions = wp_cache_get( 'alloptions', 'options' ); @@ -579,16 +611,18 @@ class WP_Widget_Recent_Posts extends WP_Widget { } function form( $instance ) { - $title = isset($instance['title']) ? esc_attr($instance['title']) : ''; - if ( !isset($instance['number']) || !$number = (int) $instance['number'] ) - $number = 5; + $title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : ''; + $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5; + $show_date = isset( $instance['show_date'] ) ? (bool) $instance['show_date'] : false; ?> -

    -

    +

    +

    + +

    +

    -

    -
    -

    +

    id="get_field_id( 'show_date' ); ?>" name="get_field_name( 'show_date' ); ?>" /> +

    '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) ) - add_action( 'wp_head', array(&$this, 'recent_comments_style') ); + add_action( 'wp_head', array($this, 'recent_comments_style') ); - add_action( 'comment_post', array(&$this, 'flush_widget_cache') ); - add_action( 'transition_comment_status', array(&$this, 'flush_widget_cache') ); + add_action( 'comment_post', array($this, 'flush_widget_cache') ); + 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 ); + $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' ) ) ); + $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' ); @@ -664,15 +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; ?> -

    -

    +

    +

    -

    -
    -

    +

    +

    __('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 +753,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,11 +781,11 @@ 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 = "RSS $title"; + $title = "RSS $title"; echo $before_widget; if ( $title ) @@ -739,7 +799,7 @@ class WP_Widget_RSS extends WP_Widget { } 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 ); } @@ -789,8 +849,8 @@ function wp_widget_rss_output( $rss, $args = array() ) { $show_date = (int) $show_date; if ( !$rss->get_item_quantity() ) { - echo ''; - $rss->__destruct(); + echo ''; + $rss->__destruct(); unset($rss); return; } @@ -805,25 +865,29 @@ 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 = esc_html( $desc ); + $desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) ); + $excerpt = wp_html_excerpt( $desc, 360 ); + + // Append ellipsis. Change existing [...] to […]. + if ( '[...]' == substr( $excerpt, -5 ) ) + $excerpt = substr( $excerpt, 0, -5 ) . '[…]'; + elseif ( '[…]' != substr( $excerpt, -10 ) && $desc != $excerpt ) + $excerpt .= ' […]'; + + $excerpt = esc_html( $excerpt ); if ( $show_summary ) { - $summary = "
    $desc
    "; + $summary = "
    $excerpt
    "; } else { $summary = ''; } $date = ''; if ( $show_date ) { - $date = $item->get_date(); + $date = $item->get_date( 'U' ); if ( $date ) { - if ( $date_stamp = strtotime( $date ) ) - $date = ' ' . date_i18n( get_option( 'date_format' ), $date_stamp ) . ''; - else - $date = ''; + $date = ' ' . date_i18n( get_option( 'date_format' ), $date ) . ''; } } @@ -843,12 +907,10 @@ function wp_widget_rss_output( $rss, $args = array() ) { } } echo ''; - $rss->__destruct(); + $rss->__destruct(); unset($rss); } - - /** * Display RSS widget options form. * @@ -893,7 +955,7 @@ function wp_widget_rss_form( $args, $inputs = null ) {

    @@ -939,9 +1001,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); @@ -969,34 +1031,133 @@ 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; + } + ?> +

    + + +

    +

    + + +

    +