<!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][9676] trunk/src/bp-xprofile: XProfile: Introduce `bp_xprofile_groups` cache group, to replace `bp` cache group usage.</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/9676">9676</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/9676","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-01 23:14:16 +0000 (Wed, 01 Apr 2015)</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'>XProfile: Introduce `bp_xprofile_groups` cache group, to replace `bp` cache group usage.
* Reduces field group cache keys down to just their ID, using a unique cache group
* Use `all` key instead of 'xprofile_groups_inc_empty`
* Use `default_visibility_levels` key instead of `xprofile_default_visibility_levels`
See <a href="http://buddypress.trac.wordpress.org/ticket/6341">#6341</a>, <a href="http://buddypress.trac.wordpress.org/ticket/5733">#5733</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofilecachephp">trunk/src/bp-xprofile/bp-xprofile-cache.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileloaderphp">trunk/src/bp-xprofile/bp-xprofile-loader.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofiletemplatephp">trunk/src/bp-xprofile/bp-xprofile-template.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilegroupphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofilecachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-cache.php 2015-04-01 22:29:02 UTC (rev 9675)
+++ trunk/src/bp-xprofile/bp-xprofile-cache.php 2015-04-01 23:14:16 UTC (rev 9676)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $object_ids Multi-dimensional array of object_ids, keyed by
</span><span class="cx" style="display: block; padding: 0 10px"> * object type ('group', 'field', 'data')
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_xprofile_update_meta_cache( $object_ids = array(), $user_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_xprofile_update_meta_cache( $object_ids = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $object_ids ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,6 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $do_query = false;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $uncached_object_ids as $object_type => $uncached_object_type_ids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $object_ids[ $object_type ] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Sanitize $object_ids passed to the function
</span><span class="cx" style="display: block; padding: 0 10px"> $object_type_ids = wp_parse_id_list( $object_ids[ $object_type ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +90,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"> // If there are uncached items, go ahead with the query
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $do_query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === $do_query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $where = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $uncached_object_ids as $otype => $oids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $oids ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,17 +139,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Clear cached XProfile field group data
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param object $group_obj
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function xprofile_clear_profile_groups_object_cache( $group_obj ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
- wp_cache_delete( 'xprofile_group_' . $group_obj->id, 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( 'all', 'bp_xprofile_groups' );
+ wp_cache_delete( $group_obj->id, 'bp_xprofile_groups' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'xprofile_group_after_delete', 'xprofile_clear_profile_groups_object_cache' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'xprofile_group_after_save', 'xprofile_clear_profile_groups_object_cache' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function xprofile_clear_profile_data_object_cache( $group_id ) {
- wp_cache_delete( 'bp_user_fullname_' . bp_loggedin_user_id(), 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Clear cached XProfile fullname data for user
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param int $user_id ID of user whose fullname cache to delete
+ */
+function xprofile_clear_profile_data_object_cache( $user_id = 0 ) {
+ wp_cache_delete( 'bp_user_fullname_' . $user_id, 'bp' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache' );
</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"> * Clear the fullname cache when field 1 is updated.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,16 +188,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param BP_XProfile_Field
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function xprofile_clear_profile_field_object_cache( $field_obj ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Clear default visibility level cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( 'xprofile_default_visibility_levels', 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( 'default_visibility_levels', 'bp_xprofile' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Modified fields can alter parent group status, in particular when
</span><span class="cx" style="display: block; padding: 0 10px"> // the group goes from empty to non-empty. Bust its cache, as well as
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // the global group_inc_empty cache
- wp_cache_delete( 'xprofile_group_' . $field_obj->group_id, 'bp' );
- wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // the global 'all' cache
+ wp_cache_delete( 'all', 'bp_xprofile_groups' );
+ wp_cache_delete( $field_obj->group_id, 'bp_xprofile_groups' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'xprofile_fields_saved_field', 'xprofile_clear_profile_field_object_cache' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'xprofile_fields_saved_field', 'xprofile_clear_profile_field_object_cache' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'xprofile_fields_deleted_field', 'xprofile_clear_profile_field_object_cache' );
</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="trunksrcbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-loader.php 2015-04-01 22:29:02 UTC (rev 9675)
+++ trunk/src/bp-xprofile/bp-xprofile-loader.php 2015-04-01 23:14:16 UTC (rev 9676)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,6 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add_global_groups( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_xprofile',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_xprofile_data',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp_xprofile_groups',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'xprofile_meta'
</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="trunksrcbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-template.php 2015-04-01 22:29:02 UTC (rev 9675)
+++ trunk/src/bp-xprofile/bp-xprofile-template.php 2015-04-01 23:14:16 UTC (rev 9676)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,11 +880,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object $groups
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_profile_get_field_groups() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $groups = wp_cache_get( 'xprofile_groups_inc_empty', 'bp' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $groups ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $groups = wp_cache_get( 'all', 'bp_xprofile_groups' );
+ if ( false === $groups ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $groups = bp_xprofile_get_groups( array( 'fetch_fields' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( 'xprofile_groups_inc_empty', $groups, 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( 'all', $groups, 'bp_xprofile' );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -973,17 +973,16 @@
</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"> function bp_get_profile_group_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$group_id = bp_action_variable( 1 ) )
- $group_id = 1;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_numeric( $group_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check action variable
+ $group_id = bp_action_variable( 1 );
+ if ( empty( $group_id ) || ! is_numeric( $group_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $group_id = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( !$group = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
- $group = new BP_XProfile_Group($group_id);
- wp_cache_set( 'xprofile_group_' . $group_id, $group, 'bp' );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for cached group
+ $group = new BP_XProfile_Group( $group_id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the profile group name.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilegroupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php 2015-04-01 22:29:02 UTC (rev 9675)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php 2015-04-01 23:14:16 UTC (rev 9676)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,11 +81,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function populate( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $group = wp_cache_get( 'xprofile_group_' . $this->id, 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group = wp_cache_get( $id, 'bp_xprofile_groups' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $group ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
</ins><span class="cx" style="display: block; padding: 0 10px"> $group = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $id, $group, 'bp_xprofile_groups' );
</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"> if ( empty( $group ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,8 +94,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"> $this->id = $group->id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->name = stripslashes( $group->name );
- $this->description = stripslashes( $group->description );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->name = $group->name;
+ $this->description = $group->description;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->can_delete = $group->can_delete;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->group_order = $group->group_order;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,8 +456,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $group_ids as $group_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If cached data is found, use it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache_key = 'xprofile_group_' . $group_id;
- $group_data = wp_cache_get( $cache_key, 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group_data = wp_cache_get( $group_id, 'bp_xprofile_groups' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $group_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $groups[ $group_id ] = $group_data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,8 +492,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $groups[ $gdata->id ] = $gdata;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cache previously uncached group data
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache_key = 'xprofile_group_' . $gdata->id;
- wp_cache_set( $cache_key, $gdata, 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $gdata->id, $gdata, 'bp_xprofile_groups' );
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,7 +541,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"> // Purge profile field group cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_delete( 'all', 'bp_xprofile_groups' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,7 +606,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function fetch_default_visibility_levels() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_visibility_levels = wp_cache_get( 'xprofile_default_visibility_levels', 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_visibility_levels = wp_cache_get( 'default_visibility_levels', 'bp_xprofile' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $default_visibility_levels ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,7 +626,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_cache_set( 'xprofile_default_visibility_levels', $default_visibility_levels, 'bp' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( 'default_visibility_levels', $default_visibility_levels, 'bp_xprofile' );
</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"> return $default_visibility_levels;
</span></span></pre>
</div>
</div>
</body>
</html>