<!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>[18228] trunk/wp-admin: Cache the Dashboard RSS Widgets HTML output to reduce the memory footprint of including SimplePie.</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://trac.wordpress.org/changeset/18228">18228</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-06-10 06:31:39 +0000 (Fri, 10 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cache the Dashboard RSS Widgets HTML output to reduce the memory footprint of including SimplePie. Fixes <a href="http://trac.wordpress.org/ticket/16927">#16927</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminindexextraphp">trunk/wp-admin/index-extra.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 (18227 => 18228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-06-10 06:22:33 UTC (rev 18227)
+++ trunk/wp-admin/includes/dashboard.php 2011-06-10 06:31:39 UTC (rev 18228)
</span><span class="lines">@@ -1031,29 +1031,34 @@
</span><span class="cx"> */
</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 hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
</span><ins>+ $doing_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
</ins><span class="cx">
</span><span class="cx"> if ( empty($check_urls) ) {
</span><span class="cx"> $widgets = get_option( 'dashboard_widget_options' );
</span><del>- if ( empty($widgets[$widget_id]['url']) ) {
</del><ins>+ if ( empty($widgets[$widget_id]['url']) && ! $doing_ajax ) {
</ins><span class="cx"> echo $loading;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> $check_urls = array( $widgets[$widget_id]['url'] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- include_once ABSPATH . WPINC . '/class-feed.php';
- foreach ( $check_urls as $check_url ) {
- $cache = new WP_Feed_Cache_Transient('', md5($check_url), '');
- if ( ! $cache->load() ) {
- echo $loading;
- return false;
- }
</del><ins>+ $cache_key = 'dash_' . md5( $callback . implode(',', $check_urls) );
+ if ( false !== ( $output = get_transient( $cache_key ) ) ) {
+ echo $output;
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! $doing_ajax ) {
+ echo $loading;
+ return false;
+ }
+
</ins><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><ins>+ ob_start();
</ins><span class="cx"> call_user_func_array( $callback, $args );
</span><ins>+ set_transient( $cache_key, ob_get_flush(), 43200); // Default lifetime in cache of 12 hours (same as the feeds)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkwpadminindexextraphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index-extra.php (18227 => 18228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index-extra.php 2011-06-10 06:22:33 UTC (rev 18227)
+++ trunk/wp-admin/index-extra.php 2011-06-10 06:31:39 UTC (rev 18228)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+define('DOING_AJAX', true);
+
</ins><span class="cx"> /** Load WordPress Bootstrap */
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="lines">@@ -18,19 +20,19 @@
</span><span class="cx"> switch ( $_GET['jax'] ) {
</span><span class="cx">
</span><span class="cx"> case 'dashboard_incoming_links' :
</span><del>- wp_dashboard_incoming_links_output();
</del><ins>+ wp_dashboard_incoming_links();
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'dashboard_primary' :
</span><del>- wp_dashboard_rss_output( 'dashboard_primary' );
</del><ins>+ wp_dashboard_primary();
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'dashboard_secondary' :
</span><del>- wp_dashboard_secondary_output();
</del><ins>+ wp_dashboard_secondary();
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'dashboard_plugins' :
</span><del>- wp_dashboard_plugins_output();
</del><ins>+ wp_dashboard_plugins();
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>