<!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] [3390] branches/1.2/bp-xprofile:
Fixes #2685 by reverting part of r3270 (branch)</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3390</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-11-11 06:22:55 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2685 by reverting part of r3270 (branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpxprofilebpxprofileclassesphp">branches/1.2/bp-xprofile/bp-xprofile-classes.php</a></li>
<li><a href="#branches12bpxprofilebpxprofiletemplatetagsphp">branches/1.2/bp-xprofile/bp-xprofile-templatetags.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 (3389 => 3390)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile/bp-xprofile-classes.php 2010-11-11 05:43:19 UTC (rev 3389)
+++ branches/1.2/bp-xprofile/bp-xprofile-classes.php 2010-11-11 06:22:55 UTC (rev 3390)
</span><span class="lines">@@ -812,7 +812,7 @@
</span><span class="cx"> $data = $wpdb->get_var( $wpdb->prepare( "SELECT value FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_ids ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return maybe_unserialize( $data );
</del><ins>+ return $data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_value_byfieldname( $fields, $user_id = null ) {
</span></span></pre></div>
<a id="branches12bpxprofilebpxprofiletemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile/bp-xprofile-templatetags.php (3389 => 3390)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile/bp-xprofile-templatetags.php 2010-11-11 05:43:19 UTC (rev 3389)
+++ branches/1.2/bp-xprofile/bp-xprofile-templatetags.php 2010-11-11 06:22:55 UTC (rev 3390)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> $html .= '<option value="">--------</option>';
</span><span class="cx">
</span><span class="cx"> for ( $k = 0; $k < count($options); $k++ ) {
</span><del>- $option_values = BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id );
</del><ins>+ $option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id ) );
</ins><span class="cx"> $option_values = (array)$option_values;
</span><span class="cx">
</span><span class="cx"> /* Check for updated posted values, but errors preventing them from being saved first time */
</span></span></pre>
</div>
</div>
</body>
</html>