<!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][5391] trunk/bp-xprofile/bp-xprofile-classes.php: Cleanup pass-by-reference and whitespace in bp-xprofile-classes.php.</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/5391">5391</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-11-27 16:52:05 +0000 (Sun, 27 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup pass-by-reference and whitespace in bp-xprofile-classes.php. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3723">#3723</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (5390 => 5391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2011-11-27 16:31:04 UTC (rev 5390)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2011-11-27 16:52:05 UTC (rev 5391)
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx"> function save() {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $this->name = apply_filters( 'xprofile_group_name_before_save', $this->name, $this->id );
- $this->description = apply_filters( 'xprofile_group_description_before_save', $this->description, $this->id );
</del><ins>+ $this->name = apply_filters( 'xprofile_group_name_before_save', $this->name, $this->id );
+ $this->description = apply_filters( 'xprofile_group_description_before_save', $this->description, $this->id );
</ins><span class="cx">
</span><del>- do_action_ref_array( 'xprofile_group_before_save', array( &$this ) );
</del><ins>+ do_action_ref_array( 'xprofile_group_before_save', array( $this ) );
</ins><span class="cx">
</span><span class="cx"> if ( $this->id )
</span><span class="cx"> $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s, description = %s WHERE id = %d", $this->name, $this->description, $this->id );
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> if ( is_wp_error( $wpdb->query( $sql ) ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- do_action_ref_array( 'xprofile_group_after_save', array( &$this ) );
</del><ins>+ do_action_ref_array( 'xprofile_group_after_save', array( $this ) );
</ins><span class="cx">
</span><span class="cx"> if ( $this->id )
</span><span class="cx"> return $this->id;
</span><span class="lines">@@ -397,16 +397,16 @@
</span><span class="cx">
</span><span class="cx"> $error = false;
</span><span class="cx">
</span><del>- $this->group_id = apply_filters( 'xprofile_field_group_id_before_save', $this->group_id, $this->id );
- $this->parent_id = apply_filters( 'xprofile_field_parent_id_before_save', $this->parent_id, $this->id );
- $this->type = apply_filters( 'xprofile_field_type_before_save', $this->type, $this->id );
- $this->name = apply_filters( 'xprofile_field_name_before_save', $this->name, $this->id );
- $this->description = apply_filters( 'xprofile_field_description_before_save', $this->description, $this->id );
- $this->is_required = apply_filters( 'xprofile_field_is_required_before_save', $this->is_required, $this->id );
- $this->order_by = apply_filters( 'xprofile_field_order_by_before_save', $this->order_by, $this->id );
- $this->field_order = apply_filters( 'xprofile_field_field_order_before_save', $this->field_order, $this->id );
</del><ins>+ $this->group_id = apply_filters( 'xprofile_field_group_id_before_save', $this->group_id, $this->id );
+ $this->parent_id = apply_filters( 'xprofile_field_parent_id_before_save', $this->parent_id, $this->id );
+ $this->type = apply_filters( 'xprofile_field_type_before_save', $this->type, $this->id );
+ $this->name = apply_filters( 'xprofile_field_name_before_save', $this->name, $this->id );
+ $this->description = apply_filters( 'xprofile_field_description_before_save', $this->description, $this->id );
+ $this->is_required = apply_filters( 'xprofile_field_is_required_before_save', $this->is_required, $this->id );
+ $this->order_by = apply_filters( 'xprofile_field_order_by_before_save', $this->order_by, $this->id );
+ $this->field_order = apply_filters( 'xprofile_field_field_order_before_save', $this->field_order, $this->id );
</ins><span class="cx">
</span><del>- do_action_ref_array( 'xprofile_field_before_save', array( &$this ) );
</del><ins>+ do_action_ref_array( 'xprofile_field_before_save', array( $this ) );
</ins><span class="cx">
</span><span class="cx"> if ( $this->id != null )
</span><span class="cx"> $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d WHERE id = %d", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->id );
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- do_action_ref_array( 'xprofile_field_after_save', array( &$this ) );
</del><ins>+ do_action_ref_array( 'xprofile_field_after_save', array( $this ) );
</ins><span class="cx">
</span><span class="cx"> return $field_id;
</span><span class="cx"> } else {
</span><span class="lines">@@ -748,7 +748,7 @@
</span><span class="cx"> </select>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php do_action_ref_array( 'xprofile_field_additional_options', array( &$this ) ); ?>
</del><ins>+ <?php do_action_ref_array( 'xprofile_field_additional_options', array( $this ) ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php $this->render_admin_form_children(); ?>
</span><span class="cx"> <?php } else { ?>
</span><span class="lines">@@ -845,7 +845,7 @@
</span><span class="cx">
</span><span class="cx"> $retval = $wpdb->get_row( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_data} WHERE user_id = %d AND field_id = %d", $this->user_id, $this->field_id ) );
</span><span class="cx">
</span><del>- return apply_filters_ref_array( 'xprofile_data_exists', array( (bool)$retval, &$this ) );
</del><ins>+ return apply_filters_ref_array( 'xprofile_data_exists', array( (bool)$retval, $this ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -862,7 +862,7 @@
</span><span class="cx">
</span><span class="cx"> $retval = $wpdb->get_row( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE id = %d", $this->field_id ) );
</span><span class="cx">
</span><del>- return apply_filters_ref_array( 'xprofile_data_is_valid_field', array( (bool)$retval, &$this ) );
</del><ins>+ return apply_filters_ref_array( 'xprofile_data_is_valid_field', array( (bool)$retval, $this ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function save() {
</span><span class="lines">@@ -873,7 +873,7 @@
</span><span class="cx"> $this->value = apply_filters( 'xprofile_data_value_before_save', $this->value, $this->id );
</span><span class="cx"> $this->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', bp_core_current_time(), $this->id );
</span><span class="cx">
</span><del>- do_action_ref_array( 'xprofile_data_before_save', array( &$this ) );
</del><ins>+ do_action_ref_array( 'xprofile_data_before_save', array( $this ) );
</ins><span class="cx">
</span><span class="cx"> if ( $this->is_valid_field() ) {
</span><span class="cx"> if ( $this->exists() && !empty( $this->value ) && strlen( trim( $this->value ) ) ) {
</span><span class="lines">@@ -891,7 +891,7 @@
</span><span class="cx"> if ( !$result )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- do_action_ref_array( 'xprofile_data_after_save', array( &$this ) );
</del><ins>+ do_action_ref_array( 'xprofile_data_after_save', array( $this ) );
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>