<!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>[BuddyPress][11057] trunk/src/bp-activity/bp-activity-functions.php: Activity: Remove front-page-specific activity query cache.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/11057">11057</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11057","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-01 14:46:11 +0000 (Thu, 01 Sep 2016)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Activity: Remove front-page-specific activity query cache.

We now have more general caching for activity queries. See <a href="http://buddypress.trac.wordpress.org/ticket/7237">#7237</a>.

Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7242">#7242</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-functions.php   2016-09-01 14:46:06 UTC (rev 11056)
+++ trunk/src/bp-activity/bp-activity-functions.php     2016-09-01 14:46:11 UTC (rev 11057)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1665,57 +1665,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'filter' => array()
</span><span class="cx" style="display: block; padding: 0 10px">        ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Attempt to return a cached copy of the first page of sitewide activity.
-       if ( ( 1 === (int) $r['page'] ) && empty( $r['max'] ) && ( 'all' === $r['fields'] ) && empty( $r['search_terms'] ) && empty( $r['meta_query'] ) && empty( $r['date_query'] ) && empty( $r['filter_query'] ) && empty( $r['filter'] ) && empty( $r['scope'] )&& empty( $r['exclude'] ) && empty( $r['in'] ) && ( 'DESC' === $r['sort'] ) && empty( $r['exclude'] ) && ( 'ham_only' === $r['spam'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity = BP_Activity_Activity::get( array(
+               'page'              => $r['page'],
+               'per_page'          => $r['per_page'],
+               'max'               => $r['max'],
+               'sort'              => $r['sort'],
+               'search_terms'      => $r['search_terms'],
+               'meta_query'        => $r['meta_query'],
+               'date_query'        => $r['date_query'],
+               'filter_query'      => $r['filter_query'],
+               'filter'            => $r['filter'],
+               'scope'             => $r['scope'],
+               'display_comments'  => $r['display_comments'],
+               'show_hidden'       => $r['show_hidden'],
+               'exclude'           => $r['exclude'],
+               'in'                => $r['in'],
+               'spam'              => $r['spam'],
+               'update_meta_cache' => $r['update_meta_cache'],
+               'count_total'       => $r['count_total'],
+               'fields'            => $r['fields'],
+       ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $activity = wp_cache_get( 'bp_activity_sitewide_front', 'bp' );
-               if ( false === $activity ) {
-
-                       $activity = BP_Activity_Activity::get( array(
-                               'page'              => $r['page'],
-                               'per_page'          => $r['per_page'],
-                               'max'               => $r['max'],
-                               'fields'            => $r['fields'],
-                               'sort'              => $r['sort'],
-                               'search_terms'      => $r['search_terms'],
-                               'meta_query'        => $r['meta_query'],
-                               'date_query'        => $r['date_query'],
-                               'filter_query'      => $r['filter_query'],
-                               'filter'            => $r['filter'],
-                               'scope'             => $r['scope'],
-                               'display_comments'  => $r['display_comments'],
-                               'show_hidden'       => $r['show_hidden'],
-                               'spam'              => $r['spam'],
-                               'update_meta_cache' => $r['update_meta_cache'],
-                               'count_total'       => $r['count_total'],
-                       ) );
-
-                       wp_cache_set( 'bp_activity_sitewide_front', $activity, 'bp' );
-               }
-
-       } else {
-               $activity = BP_Activity_Activity::get( array(
-                       'page'             => $r['page'],
-                       'per_page'         => $r['per_page'],
-                       'max'              => $r['max'],
-                       'sort'             => $r['sort'],
-                       'search_terms'     => $r['search_terms'],
-                       'meta_query'       => $r['meta_query'],
-                       'date_query'       => $r['date_query'],
-                       'filter_query'     => $r['filter_query'],
-                       'filter'           => $r['filter'],
-                       'scope'            => $r['scope'],
-                       'display_comments' => $r['display_comments'],
-                       'show_hidden'      => $r['show_hidden'],
-                       'exclude'          => $r['exclude'],
-                       'in'               => $r['in'],
-                       'spam'             => $r['spam'],
-                       'update_meta_cache' => $r['update_meta_cache'],
-                       'count_total'      => $r['count_total'],
-                       'fields'           => $r['fields'],
-               ) );
-       }
-
</del><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Filters the requested activity item(s).
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span></span></pre>
</div>
</div>

</body>
</html>