<!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>[17766] trunk/wp-admin/includes/dashboard.php: Revert unrelated code from [
17765].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17766">17766</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-04-29 14:46:27 +0000 (Fri, 29 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert unrelated code from <a href="http://trac.wordpress.org/changeset/17765">[17765]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.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 (17765 => 17766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-04-29 14:44:43 UTC (rev 17765)
+++ trunk/wp-admin/includes/dashboard.php 2011-04-29 14:46:27 UTC (rev 17766)
</span><span class="lines">@@ -925,18 +925,10 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> */
</span><span class="cx"> function wp_dashboard_plugins_output() {
</span><del>- ob_start();
- $check_urls = array(
- 'http://wordpress.org/extend/plugins/rss/browse/popular/',
- 'http://wordpress.org/extend/plugins/rss/browse/new/',
- 'http://wordpress.org/extend/plugins/rss/browse/updated/'
- );
- $transient_key = __FUNCTION__ . serialize( '' ) . implode( '|', $check_urls );
</del><ins>+ $popular = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/popular/' );
+ $new = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/new/' );
+ $updated = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/updated/' );
</ins><span class="cx">
</span><del>- $popular = fetch_feed( $check_urls[0] );
- $new = fetch_feed( $check_urls[1] );
- $updated = fetch_feed( $check_urls[2] );
-
</del><span class="cx"> if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
</span><span class="cx"> $plugin_slugs = array_keys( get_plugins() );
</span><span class="cx"> set_transient( 'plugin_slugs', $plugin_slugs, 86400 );
</span><span class="lines">@@ -1006,7 +998,6 @@
</span><span class="cx"> $$feed->__destruct();
</span><span class="cx"> unset($$feed);
</span><span class="cx"> }
</span><del>- set_transient( $transient_key, ob_get_flush() );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1027,13 +1018,10 @@
</span><span class="cx"> function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
</span><span class="cx"> $loading = '<p class="widget-loading">' . __( 'Loading&#8230;' ) . '</p>';
</span><span class="cx">
</span><del>- $widgets = get_option( 'dashboard_widget_options' );
- $output_cache = 'dashboard_' . md5( $callback . serialize( isset( $widgets[$widget_id] ) ? $widgets[$widget_id] : '' ) . implode( '|', $check_urls ) );
-
</del><span class="cx"> if ( empty($check_urls) ) {
</span><ins>+ $widgets = get_option( 'dashboard_widget_options' );
</ins><span class="cx"> if ( empty($widgets[$widget_id]['url']) ) {
</span><span class="cx"> echo $loading;
</span><del>- delete_transient( $output_cache );
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> $check_urls = array( $widgets[$widget_id]['url'] );
</span><span class="lines">@@ -1044,19 +1032,10 @@
</span><span class="cx"> $cache = new WP_Feed_Cache_Transient('', md5($check_url), '');
</span><span class="cx"> if ( ! $cache->load() ) {
</span><span class="cx"> echo $loading;
</span><del>- delete_transient( $output_cache );
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( false === $cache = get_transient( $output_cache ) ) {
- echo $loading;
- return false;
- }
-
- echo $cache;
- return true;
- /*
</del><span class="cx"> if ( $callback && is_callable( $callback ) ) {
</span><span class="cx"> $args = array_slice( func_get_args(), 2 );
</span><span class="cx"> array_unshift( $args, $widget_id );
</span><span class="lines">@@ -1064,7 +1043,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><del>- */
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Dashboard Widgets Controls */
</span></span></pre>
</div>
</div>
</body>
</html>