<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18676] trunk/wp-includes/default-widgets.php: Fix Notices in default Widgets when called using the_widget().</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18676">18676</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-09-15 09:41:17 +0000 (Thu, 15 Sep 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix Notices in default Widgets when called using the_widget(). Fixes <a href="http://core.trac.wordpress.org/ticket/16761">#16761</a> props mfields and SergeyBiryukov</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (18675 => 18676)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php        2011-09-15 09:26:07 UTC (rev 18675)
+++ trunk/wp-includes/default-widgets.php        2011-09-15 09:41:17 UTC (rev 18676)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> 
</span><span class="cx">         function widget( $args, $instance ) {
</span><span class="cx">                 extract($args);
</span><del>-                $title = apply_filters('widget_title', $instance['title'], $instance, $this-&gt;id_base);
</del><ins>+                $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this-&gt;id_base );
</ins><span class="cx"> 
</span><span class="cx">                 echo $before_widget;
</span><span class="cx">                 if ( $title )
</span><span class="lines">@@ -220,8 +220,8 @@
</span><span class="cx"> 
</span><span class="cx">         function widget( $args, $instance ) {
</span><span class="cx">                 extract($args);
</span><del>-                $c = $instance['count'] ? '1' : '0';
-                $d = $instance['dropdown'] ? '1' : '0';
</del><ins>+                $c = ! empty( $instance['count'] ) ? '1' : '0';
+                $d = ! empty( $instance['dropdown'] ) ? '1' : '0';
</ins><span class="cx">                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title'], $instance, $this-&gt;id_base);
</span><span class="cx"> 
</span><span class="cx">                 echo $before_widget;
</span><span class="lines">@@ -375,11 +375,11 @@
</span><span class="cx"> 
</span><span class="cx">         function widget( $args, $instance ) {
</span><span class="cx">                 extract($args);
</span><del>-                $title = apply_filters( 'widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this-&gt;id_base);
-                $text = apply_filters( 'widget_text', $instance['text'], $instance );
</del><ins>+                $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this-&gt;id_base );
+                $text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance );
</ins><span class="cx">                 echo $before_widget;
</span><span class="cx">                 if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?&gt;
</span><del>-                        &lt;div class=&quot;textwidget&quot;&gt;&lt;?php echo $instance['filter'] ? wpautop($text) : $text; ?&gt;&lt;/div&gt;
</del><ins>+                        &lt;div class=&quot;textwidget&quot;&gt;&lt;?php echo !empty( $instance['filter'] ) ? wpautop( $text ) : $text; ?&gt;&lt;/div&gt;
</ins><span class="cx">                 &lt;?php
</span><span class="cx">                 echo $after_widget;
</span><span class="cx">         }
</span><span class="lines">@@ -426,9 +426,9 @@
</span><span class="cx">                 extract( $args );
</span><span class="cx"> 
</span><span class="cx">                 $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this-&gt;id_base);
</span><del>-                $c = $instance['count'] ? '1' : '0';
-                $h = $instance['hierarchical'] ? '1' : '0';
-                $d = $instance['dropdown'] ? '1' : '0';
</del><ins>+                $c = ! empty( $instance['count'] ) ? '1' : '0';
+                $h = ! empty( $instance['hierarchical'] ) ? '1' : '0';
+                $d = ! empty( $instance['dropdown'] ) ? '1' : '0';
</ins><span class="cx"> 
</span><span class="cx">                 echo $before_widget;
</span><span class="cx">                 if ( $title )
</span><span class="lines">@@ -525,8 +525,8 @@
</span><span class="cx">                 if ( !is_array($cache) )
</span><span class="cx">                         $cache = array();
</span><span class="cx"> 
</span><del>-                if ( isset($cache[$args['widget_id']]) ) {
-                        echo $cache[$args['widget_id']];
</del><ins>+                if ( isset( $args['widget_id'] ) &amp;&amp; isset( $cache[ $args['widget_id'] ] ) ) {
+                        echo $cache[ $args['widget_id'] ];
</ins><span class="cx">                         return;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx">                 extract($args);
</span><span class="cx"> 
</span><span class="cx">                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title'], $instance, $this-&gt;id_base);
</span><del>-                if ( ! $number = absint( $instance['number'] ) )
</del><ins>+                if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
</ins><span class="cx">                          $number = 10;
</span><span class="cx"> 
</span><span class="cx">                 $r = new WP_Query(array('posts_per_page' =&gt; $number, 'no_found_rows' =&gt; true, 'post_status' =&gt; 'publish', 'ignore_sticky_posts' =&gt; true));
</span><span class="lines">@@ -628,8 +628,8 @@
</span><span class="cx">                 if ( ! is_array( $cache ) )
</span><span class="cx">                         $cache = array();
</span><span class="cx"> 
</span><del>-                if ( isset( $cache[$args['widget_id']] ) ) {
-                        echo $cache[$args['widget_id']];
</del><ins>+                if ( isset( $args['widget_id'] ) &amp;&amp; isset( $cache[ $args['widget_id'] ] ) ) {
+                        echo $cache[ $args['widget_id'] ];
</ins><span class="cx">                         return;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx">                  $output = '';
</span><span class="cx">                  $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Comments') : $instance['title']);
</span><span class="cx"> 
</span><del>-                if ( ! $number = absint( $instance['number'] ) )
</del><ins>+                if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
</ins><span class="cx">                          $number = 5;
</span><span class="cx"> 
</span><span class="cx">                 $comments = get_comments( array( 'number' =&gt; $number, 'status' =&gt; 'approve', 'post_status' =&gt; 'publish' ) );
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx"> 
</span><span class="cx">                 extract($args, EXTR_SKIP);
</span><span class="cx"> 
</span><del>-                $url = $instance['url'];
</del><ins>+                $url = ! empty( $instance['url'] ) ? $instance['url'] : '';
</ins><span class="cx">                 while ( stristr($url, 'http') != $url )
</span><span class="cx">                         $url = substr($url, 1);
</span><span class="cx"> 
</span><span class="lines">@@ -751,7 +751,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function update($new_instance, $old_instance) {
</span><del>-                $testurl = ( isset($new_instance['url']) &amp;&amp; ($new_instance['url'] != $old_instance['url']) );
</del><ins>+                $testurl = ( isset( $new_instance['url'] ) &amp;&amp; ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) );
</ins><span class="cx">                 return wp_widget_rss_process( $new_instance, $testurl );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -1059,12 +1059,12 @@
</span><span class="cx"> 
</span><span class="cx">         function widget($args, $instance) {
</span><span class="cx">                 // Get menu
</span><del>-                $nav_menu = wp_get_nav_menu_object( $instance['nav_menu'] );
</del><ins>+                $nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false;
</ins><span class="cx"> 
</span><span class="cx">                 if ( !$nav_menu )
</span><span class="cx">                         return;
</span><span class="cx"> 
</span><del>-                $instance['title'] = apply_filters('widget_title', $instance['title'], $instance, $this-&gt;id_base);
</del><ins>+                $instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this-&gt;id_base );
</ins><span class="cx"> 
</span><span class="cx">                 echo $args['before_widget'];
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>