Changeset 18676

Timestamp:

09/15/2011 09:41:17 AM (15 years ago)

Author:

westi

Message:

Fix Notices in default Widgets when called using the_widget(). Fixes #16761 props mfields and SergeyBiryukov

File:

• trunk/wp-includes/default-widgets.php (modified) (11 diffs)

trunk/wp-includes/default-widgets.php

@@ -178 +178 @@
         function widget( $args, $instance ) {
                 extract($args);
-                $title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
+                $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
 
                 echo $before_widget;
@@ -221 +221 @@
         function widget( $args, $instance ) {
                 extract($args);
-                $c = $instance['count'] ? '1' : '0';
-                $d = $instance['dropdown'] ? '1' : '0';
+                $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);
 
@@ -376 +376 @@
         function widget( $args, $instance ) {
                 extract($args);
-                $title = apply_filters( 'widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
-                $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; } ?>
-                        <div class="textwidget"><?php echo $instance['filter'] ? wpautop($text) : $text; ?></div>
+                        <div class="textwidget"><?php echo !empty( $instance['filter'] ) ? wpautop( $text ) : $text; ?></div>
                 <?php
                 echo $after_widget;
@@ -427 +427 @@
 
                 $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base);
-                $c = $instance['count'] ? '1' : '0';
-                $h = $instance['hierarchical'] ? '1' : '0';
-                $d = $instance['dropdown'] ? '1' : '0';
+                $c = ! empty( $instance['count'] ) ? '1' : '0';
+                $h = ! empty( $instance['hierarchical'] ) ? '1' : '0';
+                $d = ! empty( $instance['dropdown'] ) ? '1' : '0';
 
                 echo $before_widget;
@@ -526 +526 @@
                         $cache = array();
 
-                if ( isset($cache[$args['widget_id']]) ) {
-                        echo $cache[$args['widget_id']];
+                if ( isset( $args['widget_id'] ) && isset( $cache[ $args['widget_id'] ] ) ) {
+                        echo $cache[ $args['widget_id'] ];
                         return;
                 }
@@ -535 +535 @@
 
                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title'], $instance, $this->id_base);
-                if ( ! $number = absint( $instance['number'] ) )
+                if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
                         $number = 10;
 
@@ -629 +629 @@
                         $cache = array();
 
-                if ( isset( $cache[$args['widget_id']] ) ) {
-                        echo $cache[$args['widget_id']];
+                if ( isset( $args['widget_id'] ) && isset( $cache[ $args['widget_id'] ] ) ) {
+                        echo $cache[ $args['widget_id'] ];
                         return;
                 }
@@ -638 +638 @@
                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Comments') : $instance['title']);
 
-                if ( ! $number = absint( $instance['number'] ) )
+                if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
                         $number = 5;
 
@@ -706 +706 @@
                 extract($args, EXTR_SKIP);
 
-                $url = $instance['url'];
+                $url = ! empty( $instance['url'] ) ? $instance['url'] : '';
                 while ( stristr($url, 'http') != $url )
                         $url = substr($url, 1);
@@ -752 +752 @@
 
         function update($new_instance, $old_instance) {
-                $testurl = ( isset($new_instance['url']) && ($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 );
         }
@@ -1060 +1060 @@
         function widget($args, $instance) {
                 // Get menu
-                $nav_menu = wp_get_nav_menu_object( $instance['nav_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', $instance['title'], $instance, $this->id_base);
+                $instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
 
                 echo $args['before_widget'];