<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3394] trunk/bp-xprofile.php:
Whitespace and code standards sweep on xprofile meta functions</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3394</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-11-11 06:54:38 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace and code standards sweep on xprofile meta functions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (3393 => 3394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-11-11 06:35:42 UTC (rev 3393)
+++ trunk/bp-xprofile.php 2010-11-11 06:54:38 UTC (rev 3394)
</span><span class="lines">@@ -936,22 +936,21 @@
</span><span class="cx"> if ( !in_array( $object_type, array( 'group', 'field', 'data' ) ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
</del><ins>+ $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
</ins><span class="cx">
</span><del>- if ( is_array($meta_value) || is_object($meta_value) )
- $meta_value = serialize($meta_value);
</del><ins>+ if ( is_array( $meta_value ) || is_object( $meta_value ) )
+ $meta_value = serialize( $meta_value );
</ins><span class="cx">
</span><span class="cx"> $meta_value = trim( $meta_value );
</span><span class="cx">
</span><del>- if ( !$meta_key ) {
</del><ins>+ if ( !$meta_key )
</ins><span class="cx"> $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s", $object_id, $object_type ) );
</span><del>- } else if ( $meta_value ) {
</del><ins>+ else if ( $meta_value )
</ins><span class="cx"> $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s AND meta_value = %s", $object_id, $object_type, $meta_key, $meta_value ) );
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s", $object_id, $object_type, $meta_key ) );
</span><del>- }
</del><span class="cx">
</span><del>- /* Delete the cached object */
</del><ins>+ // Delete the cached object
</ins><span class="cx"> wp_cache_delete( 'bp_xprofile_meta_' . $object_type . '_' . $object_id . '_' . $meta_key, 'bp' );
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -971,27 +970,28 @@
</span><span class="cx"> if ( !in_array( $object_type, array( 'group', 'field', 'data' ) ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( !empty($meta_key) ) {
- $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
</del><ins>+ if ( !empty( $meta_key ) ) {
+ $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
</ins><span class="cx">
</span><span class="cx"> if ( !$metas = wp_cache_get( 'bp_xprofile_meta_' . $object_type . '_' . $object_id . '_' . $meta_key, 'bp' ) ) {
</span><del>- $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s", $object_id, $object_type, $meta_key) );
</del><ins>+ $metas = $wpdb->get_col( $wpdb->prepare( "SELECT meta_value FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s", $object_id, $object_type, $meta_key ) );
</ins><span class="cx"> wp_cache_set( 'bp_xprofile_meta_' . $object_type . '_' . $object_id . '_' . $meta_key, $metas, 'bp' );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s", $object_id, $object_type ) );
</del><ins>+ $metas = $wpdb->get_col( $wpdb->prepare( "SELECT meta_value FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s", $object_id, $object_type ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty($metas) ) {
- if ( empty($meta_key) )
</del><ins>+ if ( empty( $metas ) ) {
+ if ( empty( $meta_key ) ) {
</ins><span class="cx"> return array();
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> return '';
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $metas = array_map('maybe_unserialize', (array)$metas);
</del><ins>+ $metas = array_map( 'maybe_unserialize', (array)$metas );
</ins><span class="cx">
</span><del>- if ( 1 == count($metas) )
</del><ins>+ if ( 1 == count( $metas ) )
</ins><span class="cx"> return $metas[0];
</span><span class="cx"> else
</span><span class="cx"> return $metas;
</span><span class="lines">@@ -1013,26 +1013,24 @@
</span><span class="cx">
</span><span class="cx"> $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
</span><span class="cx">
</span><del>- if ( is_string($meta_value) )
- $meta_value = stripslashes($wpdb->escape($meta_value));
</del><ins>+ if ( is_string( $meta_value ) )
+ $meta_value = stripslashes( $wpdb->escape( $meta_value ) );
</ins><span class="cx">
</span><del>- $meta_value = maybe_serialize($meta_value);
</del><ins>+ $meta_value = maybe_serialize( $meta_value );
</ins><span class="cx">
</span><del>- if (empty($meta_value)) {
</del><ins>+ if ( empty( $meta_value ) )
</ins><span class="cx"> return bp_xprofile_delete_meta( $object_id, $object_type, $meta_key );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s", $object_id, $object_type, $meta_key ) );
</span><span class="cx">
</span><del>- if ( !$cur ) {
</del><ins>+ if ( !$cur )
</ins><span class="cx"> $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp->profile->table_name_meta . " ( object_id, object_type, meta_key, meta_value ) VALUES ( %d, %s, %s, %s )", $object_id, $object_type, $meta_key, $meta_value ) );
</span><del>- } else if ( $cur->meta_value != $meta_value ) {
</del><ins>+ else if ( $cur->meta_value != $meta_value )
</ins><span class="cx"> $wpdb->query( $wpdb->prepare( "UPDATE " . $bp->profile->table_name_meta . " SET meta_value = %s WHERE object_id = %d AND object_type = %s AND meta_key = %s", $meta_value, $object_id, $object_type, $meta_key ) );
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> return false;
</span><del>- }
</del><span class="cx">
</span><del>- /* Update the cached object and recache */
</del><ins>+ // Update the cached object and recache
</ins><span class="cx"> wp_cache_set( 'bp_xprofile_meta_' . $object_type . '_' . $object_id . '_' . $meta_key, $meta_value, 'bp' );
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>