<!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] [3395] branches/1.2/bp-xprofile/bp-xprofile-classes.php:
Fixes #1236 (branch) props swinton</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3395</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-11-11 07:15:01 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1236 (branch) props swinton</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpxprofilebpxprofileclassesphp">branches/1.2/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile/bp-xprofile-classes.php (3394 => 3395)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile/bp-xprofile-classes.php 2010-11-11 06:54:38 UTC (rev 3394)
+++ branches/1.2/bp-xprofile/bp-xprofile-classes.php 2010-11-11 07:15:01 UTC (rev 3395)
</span><span class="lines">@@ -693,57 +693,69 @@
</span><span class="cx">
</span><span class="cx"> if ( $profiledata = $wpdb->get_row($sql) ) {
</span><span class="cx">
</span><del>- $this->id = $profiledata->id;
- $this->user_id = $profiledata->user_id;
- $this->field_id = $profiledata->field_id;
- $this->value = stripslashes($profiledata->value);
</del><ins>+ $this->id = $profiledata->id;
+ $this->user_id = $profiledata->user_id;
+ $this->field_id = $profiledata->field_id;
+ $this->value = stripslashes($profiledata->value);
</ins><span class="cx"> $this->last_updated = $profiledata->last_updated;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * exists ()
+ *
+ * Check if there is data already for the user.
+ *
+ * @global object $wpdb
+ * @global array $bp
+ * @return bool
+ */
</ins><span class="cx"> function exists() {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- // check to see if there is data already for the user.
- $sql = $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_data} WHERE user_id = %d AND field_id = %d", $this->user_id, $this->field_id );
</del><span class="cx">
</span><del>- if ( !$wpdb->get_row($sql) )
- return false;
</del><ins>+ $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 ) );
</ins><span class="cx">
</span><del>- return true;
</del><ins>+ return apply_filters( 'xprofile_data_exists', (bool)$retval, $this );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * is_valid_field()
+ *
+ * Check if this data is for a valid field.
+ *
+ * @global object $wpdb
+ * @global array $bp
+ * @return bool
+ */
</ins><span class="cx"> function is_valid_field() {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- // check to see if this data is actually for a valid field.
- $sql = $wpdb->prepare("SELECT id FROM {$bp->profile->table_name_fields} WHERE id = %d", $this->field_id );
</del><ins>+ $retval = $wpdb->get_row( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE id = %d", $this->field_id ) );
</ins><span class="cx">
</span><del>- if ( !$wpdb->get_row($sql) )
- return false;
-
- return true;
</del><ins>+ return apply_filters( 'xprofile_data_is_valid_field', (bool)$retval, $this );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function save() {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $this->user_id = apply_filters( 'xprofile_data_user_id_before_save', $this->user_id, $this->id );
- $this->field_id = apply_filters( 'xprofile_data_field_id_before_save', $this->field_id, $this->id );
- $this->value = apply_filters( 'xprofile_data_value_before_save', $this->value, $this->id );
</del><ins>+ $this->user_id = apply_filters( 'xprofile_data_user_id_before_save', $this->user_id, $this->id );
+ $this->field_id = apply_filters( 'xprofile_data_field_id_before_save', $this->field_id, $this->id );
+ $this->value = apply_filters( 'xprofile_data_value_before_save', $this->value, $this->id );
</ins><span class="cx"> $this->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', date( 'Y-m-d H:i:s' ), $this->id );
</span><span class="cx">
</span><span class="cx"> do_action( 'xprofile_data_before_save', $this );
</span><span class="cx">
</span><span class="cx"> if ( $this->is_valid_field() ) {
</span><del>- if ( $this->exists() && !empty( $this->value ) && strlen( trim( $this->value ) ) ) {
</del><ins>+ if ( $this->exists() && !empty( $this->value ) && strlen( trim( $this->value ) ) )
</ins><span class="cx"> $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_data} SET value = %s, last_updated = %s WHERE user_id = %d AND field_id = %d", $this->value, $this->last_updated, $this->user_id, $this->field_id ) );
</span><del>- } else if ( $this->exists() && empty( $this->value ) ) {
- // Data removed, delete the entry.
</del><ins>+
+ // Data removed, delete the entry.
+ elseif ( $this->exists() && empty( $this->value ) )
</ins><span class="cx"> $result = $this->delete();
</span><del>- } else {
</del><ins>+
+ else
</ins><span class="cx"> $result = $wpdb->query( $wpdb->prepare("INSERT INTO {$bp->profile->table_name_data} (user_id, field_id, value, last_updated) VALUES (%d, %d, %s, %s)", $this->user_id, $this->field_id, $this->value, $this->last_updated ) );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> if ( !$result )
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>