<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12209] trunk: Don't destruct if WP_Error.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12209">12209</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-11-18 21:52:38 +0000 (Wed, 18 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't destruct if WP_Error. Props scribu. fixes <a href="http://trac.wordpress.org/ticket/11168">#11168</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (12208 => 12209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2009-11-18 21:04:09 UTC (rev 12208)
+++ trunk/wp-admin/includes/dashboard.php 2009-11-18 21:52:38 UTC (rev 12209)
</span><span class="lines">@@ -624,8 +624,6 @@
</span><span class="cx"> printf(__('<strong>RSS Error</strong>: %s'), $rss->get_error_message());
</span><span class="cx"> echo '</p>';
</span><span class="cx"> }
</span><del>- $rss->__destruct();
- unset($rss);
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -742,8 +740,6 @@
</span><span class="cx"> printf(__('<strong>RSS Error</strong>: %s'), $rss->get_error_message());
</span><span class="cx"> echo '</p></div>';
</span><span class="cx"> }
</span><del>- $rss->__destruct();
- unset($rss);
</del><span class="cx"> } elseif ( !$rss->get_item_quantity() ) {
</span><span class="cx"> $rss->__destruct();
</span><span class="cx"> unset($rss);
</span><span class="lines">@@ -932,12 +928,13 @@
</span><span class="cx"> // title is optional. If black, fill it if possible
</span><span class="cx"> if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
</span><span class="cx"> $rss = fetch_feed($widget_options[$widget_id]['url']);
</span><del>- if ( ! is_wp_error($rss) )
- $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
- else
</del><ins>+ if ( is_wp_error($rss) ) {
</ins><span class="cx"> $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
</span><del>- $rss->__destruct();
- unset($rss);
</del><ins>+ } else {
+ $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
+ $rss->__destruct();
+ unset($rss);
+ }
</ins><span class="cx"> }
</span><span class="cx"> update_option( 'dashboard_widget_options', $widget_options );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (12208 => 12209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2009-11-18 21:04:09 UTC (rev 12208)
+++ trunk/wp-includes/default-widgets.php 2009-11-18 21:52:38 UTC (rev 12209)
</span><span class="lines">@@ -772,8 +772,6 @@
</span><span class="cx"> if ( is_wp_error($rss) ) {
</span><span class="cx"> if ( is_admin() || current_user_can('manage_options') )
</span><span class="cx"> echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>';
</span><del>- $rss->__destruct();
- unset($rss);
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -953,9 +951,10 @@
</span><span class="cx"> $link = esc_url(strip_tags($rss->get_permalink()));
</span><span class="cx"> while ( stristr($link, 'http') != $link )
</span><span class="cx"> $link = substr($link, 1);
</span><ins>+
+ $rss->__destruct();
+ unset($rss);
</ins><span class="cx"> }
</span><del>- $rss->__destruct();
- unset($rss);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return compact( 'title', 'url', 'link', 'items', 'error', 'show_summary', 'show_author', 'show_date' );
</span></span></pre>
</div>
</div>
</body>
</html>