<!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][12173] trunk: Blogs: rename meta table key for compatibilty with #WP37923</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 { white-space: pre-line; 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/12173">12173</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/12173","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-06-16 09:37:33 +0000 (Sat, 16 Jun 2018)</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'>Blogs: rename meta table key for compatibilty with #WP37923
The WordPress change introduces a blogmeta table in WordPress 5.0.
It uses `$wpdb->blogmeta` to access the table name, which is what BuddyPress has been using.
This'll be a breaking change for any manual SQL queries as soon as WP 5.0 is released.
When BuddyPress requires 5.0, we can look at migrating table content over, but that is some ways in the future.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7834">#7834</a>
Props needle, r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogscachephp">trunk/src/bp-blogs/bp-blogs-cache.php</a></li>
<li><a href="#trunksrcbpblogsbpblogsfiltersphp">trunk/src/bp-blogs/bp-blogs-filters.php</a></li>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunksrcbpblogsclassesclassbpblogscomponentphp">trunk/src/bp-blogs/classes/class-bp-blogs-component.php</a></li>
<li><a href="#trunktestsphpunittestcasesblogscachephp">trunk/tests/phpunit/testcases/blogs/cache.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-cache.php 2018-06-16 09:37:27 UTC (rev 12172)
+++ trunk/src/bp-blogs/bp-blogs-cache.php 2018-06-16 09:37:33 UTC (rev 12173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_ids' => $blog_ids,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_type' => buddypress()->blogs->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_column' => 'blog_id',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'cache_group' => 'blog_meta',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cache_group' => 'bp_blog_meta',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_table' => buddypress()->blogs->table_name_blogmeta,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpblogsbpblogsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-filters.php 2018-06-16 09:37:27 UTC (rev 12172)
+++ trunk/src/bp-blogs/bp-blogs-filters.php 2018-06-16 09:37:33 UTC (rev 12173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,3 +135,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $sizes;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'site_icon_image_sizes', 'bp_blogs_register_custom_site_icon_size' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Filters the column name during blog metadata queries.
+ *
+ * This filters 'sanitize_key', which is used during various core metadata
+ * API functions: {@link https://core.trac.wordpress.org/browser/branches/4.9/src/wp-includes/meta.php?lines=47,160,324}.
+ * Due to how we are passing our meta type, we need to ensure that the correct
+ * DB column is referenced during blogmeta queries.
+ *
+ * @since 4.0.0
+ *
+ * @see bp_blogs_delete_blogmeta()
+ * @see bp_blogs_get_blogmeta()
+ * @see bp_blogs_update_blogmeta()
+ * @see bp_blogs_add_blogmeta()
+ *
+ * @param string $retval
+ *
+ * @return string
+ */
+function bp_blogs_filter_meta_column_name( $retval ) {
+ if ( 'bp_blog_id' === $retval ) {
+ $retval = 'blog_id';
+ }
+ return $retval;
+}
</ins></span></pre></div>
<a id="trunksrcbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-functions.php 2018-06-16 09:37:27 UTC (rev 12172)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2018-06-16 09:37:33 UTC (rev 12173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $blogs as $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure that the cache is clear after the table TRUNCATE above.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $blog->blog_id, 'blog_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( $blog->blog_id, 'bp_blog_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get all users.
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1302,7 +1302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Legacy - if no meta_key is passed, delete all for the blog_id.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $meta_key ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->blogmeta} WHERE blog_id = %d", $blog_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->bp_blogmeta} WHERE blog_id = %d", $blog_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $delete_all = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = array( $meta_key );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1309,13 +1309,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $keys as $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval = delete_metadata( 'blog', $blog_id, $key, $meta_value, $delete_all );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = delete_metadata( 'bp_blog', $blog_id, $key, $meta_value, $delete_all );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'query', 'bp_filter_metaid_column_name' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,7 +1340,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_blogs_get_blogmeta( $blog_id, $meta_key = '', $single = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval = get_metadata( 'blog', $blog_id, $meta_key, $single );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
+ $retval = get_metadata( 'bp_blog', $blog_id, $meta_key, $single );
+ remove_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1361,7 +1365,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_blogs_update_blogmeta( $blog_id, $meta_key, $meta_value, $prev_value = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval = update_metadata( 'blog', $blog_id, $meta_key, $meta_value, $prev_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
+ $retval = update_metadata( 'bp_blog', $blog_id, $meta_key, $meta_value, $prev_value );
+ remove_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1382,7 +1388,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_blogs_add_blogmeta( $blog_id, $meta_key, $meta_value, $unique = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval = add_metadata( 'blog', $blog_id, $meta_key, $meta_value, $unique );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
+ $retval = add_metadata( 'bp_blog', $blog_id, $meta_key, $meta_value, $unique );
+ remove_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span></span></pre></div>
<a id="trunksrcbpblogsclassesclassbpblogscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/classes/class-bp-blogs-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/classes/class-bp-blogs-component.php 2018-06-16 09:37:27 UTC (rev 12172)
+++ trunk/src/bp-blogs/classes/class-bp-blogs-component.php 2018-06-16 09:37:33 UTC (rev 12173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_tables = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blog' => $bp->table_prefix . 'bp_user_blogs_blogmeta',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_blog' => $bp->table_prefix . 'bp_user_blogs_blogmeta',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fetch the default directory title.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Global groups.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add_global_groups( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'blog_meta'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_blog_meta'
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setup_cache_groups();
</span></span></pre></div>
<a id="trunktestsphpunittestcasesblogscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/blogs/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/blogs/cache.php 2018-06-16 09:37:27 UTC (rev 12172)
+++ trunk/tests/phpunit/testcases/blogs/cache.php 2018-06-16 09:37:33 UTC (rev 12173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,12 +30,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $b2_last_activity = bp_blogs_get_blogmeta( $b2, 'last_activity' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear caches (due to _get_)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $b1, 'blog_meta' );
- wp_cache_delete( $b2, 'blog_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( $b1, 'bp_blog_meta' );
+ wp_cache_delete( $b2, 'bp_blog_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Caches should be empty
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( wp_cache_get( $b1, 'blog_meta' ) );
- $this->assertFalse( wp_cache_get( $b2, 'blog_meta' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( wp_cache_get( $b1, 'bp_blog_meta' ) );
+ $this->assertFalse( wp_cache_get( $b2, 'bp_blog_meta' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp_blogs_update_meta_cache( array( $b1, $b2 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,12 +74,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The cache may contain more than just this, so loop through
</span><span class="cx" style="display: block; padding: 0 10px"> // and check only relevant keys
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $b1_found = wp_cache_get( $b1, 'blog_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b1_found = wp_cache_get( $b1, 'bp_blog_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $b1_expected as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $v, $b1_found[ $k ] );
</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">- $b2_found = wp_cache_get( $b2, 'blog_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b2_found = wp_cache_get( $b2, 'bp_blog_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $b2_expected as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $v, $b2_found[ $k ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,12 +120,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $b2_last_activity = bp_blogs_get_blogmeta( $b2, 'last_activity' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear caches (due to _get_)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $b1, 'blog_meta' );
- wp_cache_delete( $b2, 'blog_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( $b1, 'bp_blog_meta' );
+ wp_cache_delete( $b2, 'bp_blog_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Caches should be empty
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( wp_cache_get( $b1, 'blog_meta' ) );
- $this->assertFalse( wp_cache_get( $b2, 'blog_meta' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( wp_cache_get( $b1, 'bp_blog_meta' ) );
+ $this->assertFalse( wp_cache_get( $b2, 'bp_blog_meta' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp_has_blogs( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $u,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,12 +166,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The cache may contain more than just this, so loop through
</span><span class="cx" style="display: block; padding: 0 10px"> // and check only relevant keys
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $b1_found = wp_cache_get( $b1, 'blog_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b1_found = wp_cache_get( $b1, 'bp_blog_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $b1_expected as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $v, $b1_found[ $k ] );
</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">- $b2_found = wp_cache_get( $b2, 'blog_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b2_found = wp_cache_get( $b2, 'bp_blog_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $b2_expected as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $v, $b2_found[ $k ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,12 +214,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $b2_last_activity = bp_blogs_get_blogmeta( $b2, 'last_activity' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear caches (due to _get_)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( $b1, 'blog_meta' );
- wp_cache_delete( $b2, 'blog_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( $b1, 'bp_blog_meta' );
+ wp_cache_delete( $b2, 'bp_blog_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Caches should be empty
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( wp_cache_get( $b1, 'blog_meta' ) );
- $this->assertFalse( wp_cache_get( $b2, 'blog_meta' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( wp_cache_get( $b1, 'bp_blog_meta' ) );
+ $this->assertFalse( wp_cache_get( $b2, 'bp_blog_meta' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp_has_blogs( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_meta_cache' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,8 +226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Caches should be empty
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( wp_cache_get( $b1, 'blog_meta' ) );
- $this->assertFalse( wp_cache_get( $b2, 'blog_meta' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( wp_cache_get( $b1, 'bp_blog_meta' ) );
+ $this->assertFalse( wp_cache_get( $b2, 'bp_blog_meta' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_current_user( $old_user );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // prime cache
</span><span class="cx" style="display: block; padding: 0 10px"> bp_blogs_get_blogmeta( $b1, 'url' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotEmpty( wp_cache_get( $b1, 'blog_meta' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotEmpty( wp_cache_get( $b1, 'bp_blog_meta' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // updating blog details should purge cache
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $b1, array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,6 +312,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // assert cache is purged
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEmpty( wp_cache_get( $b1, 'blog_meta' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( wp_cache_get( $b1, 'bp_blog_meta' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>