<!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][5796] trunk: Swaps _user_meta() functions with BP equivalents.</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://buddypress.trac.wordpress.org/changeset/5796">5796</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-02-16 13:40:18 +0000 (Thu, 16 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Swaps _user_meta() functions with BP equivalents. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4013">#4013</a>. Props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpforumsbpforumsbbpresssaphp">trunk/bp-forums/bp-forums-bbpress-sa.php</a></li>
<li><a href="#trunkbpforumsbpforumsfunctionsphp">trunk/bp-forums/bp-forums-functions.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilefunctionsphp">trunk/bp-xprofile/bp-xprofile-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (5795 => 5796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2012-02-15 21:36:09 UTC (rev 5795)
+++ trunk/bp-blogs/bp-blogs-functions.php 2012-02-16 13:40:18 UTC (rev 5796)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> if ( empty( $role ) ) {
</span><span class="cx"> $key = $wpdb->get_blog_prefix( $blog_id ). 'capabilities';
</span><span class="cx">
</span><del>- $roles = get_user_meta( $user_id, $key, true );
</del><ins>+ $roles = bp_get_user_meta( $user_id, $key, true );
</ins><span class="cx">
</span><span class="cx"> if ( is_array( $roles ) )
</span><span class="cx"> $role = array_search( 1, $roles );
</span></span></pre></div>
<a id="trunkbpforumsbpforumsbbpresssaphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-bbpress-sa.php (5795 => 5796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-bbpress-sa.php 2012-02-15 21:36:09 UTC (rev 5795)
+++ trunk/bp-forums/bp-forums-bbpress-sa.php 2012-02-16 13:40:18 UTC (rev 5796)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> // Set the site admins as the keymasters
</span><span class="cx"> $site_admins = get_site_option( 'site_admins', array('admin') );
</span><span class="cx"> foreach ( (array) $site_admins as $site_admin )
</span><del>- update_user_meta( bp_core_get_userid( $site_admin ), $bb_table_prefix . 'capabilities', array( 'keymaster' => true ) );
</del><ins>+ bp_update_user_meta( bp_core_get_userid( $site_admin ), $bb_table_prefix . 'capabilities', array( 'keymaster' => true ) );
</ins><span class="cx">
</span><span class="cx"> // Create the first forum.
</span><span class="cx"> bb_new_forum( array( 'forum_name' => 'Default Forum' ) );
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $args, EXTR_SKIP );
</span><span class="cx">
</span><del>- return update_user_meta( $id, $meta_key, $meta_value );
</del><ins>+ return bp_update_user_meta( $id, $meta_key, $meta_value );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpforumsbpforumsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-functions.php (5795 => 5796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-functions.php 2012-02-15 21:36:09 UTC (rev 5795)
+++ trunk/bp-forums/bp-forums-functions.php 2012-02-16 13:40:18 UTC (rev 5796)
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx"> if ( !bp_loggedin_user_id() )
</span><span class="cx"> return $allcaps;
</span><span class="cx">
</span><del>- $bb_cap = get_user_meta( bp_loggedin_user_id(), $bb_table_prefix . 'capabilities', true );
</del><ins>+ $bb_cap = bp_get_user_meta( bp_loggedin_user_id(), $bb_table_prefix . 'capabilities', true );
</ins><span class="cx">
</span><span class="cx"> if ( empty( $bb_cap ) )
</span><span class="cx"> return $allcaps;
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (5795 => 5796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2012-02-15 21:36:09 UTC (rev 5795)
+++ trunk/bp-members/bp-members-functions.php 2012-02-16 13:40:18 UTC (rev 5796)
</span><span class="lines">@@ -1073,12 +1073,12 @@
</span><span class="cx">
</span><span class="cx"> // Add the user's fullname to Xprofile
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) ) {
</span><del>- $firstname = get_user_meta( $user_id, 'first_name', true );
- $lastname = ' ' . get_user_meta( $user_id, 'last_name', true );
</del><ins>+ $firstname = bp_get_user_meta( $user_id, 'first_name', true );
+ $lastname = ' ' . bp_get_user_meta( $user_id, 'last_name', true );
</ins><span class="cx"> $name = $firstname . $lastname;
</span><span class="cx">
</span><span class="cx"> if ( empty( $name ) || ' ' == $name )
</span><del>- $name = get_user_meta( $user_id, 'nickname', true );
</del><ins>+ $name = bp_get_user_meta( $user_id, 'nickname', true );
</ins><span class="cx">
</span><span class="cx"> xprofile_set_field_data( 1, $user_id, $name );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (5795 => 5796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2012-02-15 21:36:09 UTC (rev 5795)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2012-02-16 13:40:18 UTC (rev 5796)
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> // Get the user's visibility level preferences
</span><del>- $visibility_levels = get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
</del><ins>+ $visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
</ins><span class="cx">
</span><span class="cx"> foreach( (array)$fields as $key => $field ) {
</span><span class="cx"> // Look to see if the user has set the visibility for this field
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-functions.php (5795 => 5796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-functions.php 2012-02-15 21:36:09 UTC (rev 5795)
+++ trunk/bp-xprofile/bp-xprofile-functions.php 2012-02-16 13:40:18 UTC (rev 5796)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Stored in an array in usermeta
</span><del>- $current_visibility_levels = get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
</del><ins>+ $current_visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
</ins><span class="cx">
</span><span class="cx"> if ( !$current_visibility_levels ) {
</span><span class="cx"> $current_visibility_levels = array();
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> $current_visibility_levels[$field_id] = $visibility_level;
</span><span class="cx">
</span><del>- return update_user_meta( $user_id, 'bp_xprofile_visibility_levels', $current_visibility_levels );
</del><ins>+ return bp_update_user_meta( $user_id, 'bp_xprofile_visibility_levels', $current_visibility_levels );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function xprofile_delete_field_data( $field, $user_id ) {
</span><span class="lines">@@ -441,9 +441,9 @@
</span><span class="cx"> $lastname = trim( substr( $fullname, $space, strlen( $fullname ) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- update_user_meta( $user_id, 'nickname', $fullname );
- update_user_meta( $user_id, 'first_name', $firstname );
- update_user_meta( $user_id, 'last_name', $lastname );
</del><ins>+ bp_update_user_meta( $user_id, 'nickname', $fullname );
+ bp_update_user_meta( $user_id, 'first_name', $firstname );
+ bp_update_user_meta( $user_id, 'last_name', $lastname );
</ins><span class="cx">
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $user_id ) );
</span><span class="cx"> }
</span><span class="lines">@@ -475,22 +475,22 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress XProfile
</span><span class="cx"> * @param $user_id The ID of the deleted user
</span><del>- * @uses get_user_meta() Get a user meta value based on meta key from wp_usermeta
- * @uses delete_user_meta() Delete user meta value based on meta key from wp_usermeta
</del><ins>+ * @uses bp_get_user_meta() Get a user meta value based on meta key from wp_usermeta
+ * @uses bp_delete_user_meta() Delete user meta value based on meta key from wp_usermeta
</ins><span class="cx"> * @uses delete_data_for_user() Removes all profile data from the xprofile tables for the user
</span><span class="cx"> */
</span><span class="cx"> function xprofile_remove_data( $user_id ) {
</span><span class="cx"> BP_XProfile_ProfileData::delete_data_for_user( $user_id );
</span><span class="cx">
</span><span class="cx"> // delete any avatar files.
</span><del>- @unlink( get_user_meta( $user_id, 'bp_core_avatar_v1_path', true ) );
- @unlink( get_user_meta( $user_id, 'bp_core_avatar_v2_path', true ) );
</del><ins>+ @unlink( bp_get_user_meta( $user_id, 'bp_core_avatar_v1_path', true ) );
+ @unlink( bp_get_user_meta( $user_id, 'bp_core_avatar_v2_path', true ) );
</ins><span class="cx">
</span><span class="cx"> // unset the usermeta for avatars from the usermeta table.
</span><del>- delete_user_meta( $user_id, 'bp_core_avatar_v1' );
- delete_user_meta( $user_id, 'bp_core_avatar_v1_path' );
- delete_user_meta( $user_id, 'bp_core_avatar_v2' );
- delete_user_meta( $user_id, 'bp_core_avatar_v2_path' );
</del><ins>+ bp_delete_user_meta( $user_id, 'bp_core_avatar_v1' );
+ bp_delete_user_meta( $user_id, 'bp_core_avatar_v1_path' );
+ bp_delete_user_meta( $user_id, 'bp_core_avatar_v2' );
+ bp_delete_user_meta( $user_id, 'bp_core_avatar_v2_path' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wpmu_delete_user', 'xprofile_remove_data' );
</span><span class="cx"> add_action( 'delete_user', 'xprofile_remove_data' );
</span><span class="lines">@@ -720,7 +720,7 @@
</span><span class="cx"> $levels = (array)$levels;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $user_visibility_levels = get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
</del><ins>+ $user_visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
</ins><span class="cx">
</span><span class="cx"> $field_ids = array();
</span><span class="cx"> foreach( (array)$user_visibility_levels as $field_id => $field_visibility ) {
</span></span></pre>
</div>
</div>
</body>
</html>