<!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][3560] trunk: Adds rel=nofollow to xprofile data links.</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>3560</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-12-22 13:48:36 +0000 (Wed, 22 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds rel=nofollow to xprofile data links. Fixes #2696. Fixes a handful of WP_DEBUG errors throughout xprofile.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilefiltersphp">trunk/bp-xprofile/bp-xprofile-filters.php</a></li>
<li><a href="#trunkbpxprofilebpxprofiletemplatetagsphp">trunk/bp-xprofile/bp-xprofile-templatetags.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (3559 => 3560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2010-12-22 01:38:07 UTC (rev 3559)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2010-12-22 13:48:36 UTC (rev 3560)
</span><span class="lines">@@ -217,7 +217,8 @@
</span><span class="cx"> $field->description = wp_filter_kses( $_POST['description'] );
</span><span class="cx"> $field->is_required = wp_filter_kses( $_POST['required'] );
</span><span class="cx"> $field->type = wp_filter_kses( $_POST['fieldtype'] );
</span><del>- $field->order_by = wp_filter_kses( $_POST["sort_order_{$field->type}"] );
</del><ins>+ if ( !empty( $_POST["sort_order_{$field->type}"] ) )
+ $field->order_by = wp_filter_kses( $_POST["sort_order_{$field->type}"] );
</ins><span class="cx">
</span><span class="cx"> $field->field_order = $wpdb->get_var( $wpdb->prepare( "SELECT field_order FROM {$bp->profile->table_name_fields} WHERE id = %d", $field_id ) );
</span><span class="cx"> if ( !$field->field_order ) {
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-filters.php (3559 => 3560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-filters.php 2010-12-22 01:38:07 UTC (rev 3559)
+++ trunk/bp-xprofile/bp-xprofile-filters.php 2010-12-22 13:48:36 UTC (rev 3560)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx">
</span><span class="cx"> /* Apply WordPress defined filters */
</span><span class="cx">
</span><del>-add_filter( 'bp_get_the_profile_field_value', 'wp_filter_kses', 1 );
</del><span class="cx"> add_filter( 'bp_get_the_profile_field_name', 'wp_filter_kses', 1 );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_edit_value', 'wp_filter_kses', 1 );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_description', 'wp_filter_kses', 1 );
</span><span class="lines">@@ -31,13 +30,33 @@
</span><span class="cx">
</span><span class="cx"> /* Custom BuddyPress filters */
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_kses', 1 );
+
</ins><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value', 1, 2 );
</span><span class="cx"> add_filter( 'bp_get_the_site_member_profile_data', 'xprofile_filter_format_field_value', 1, 2 );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 50, 2 );
</span><span class="cx">
</span><del>-add_filter( 'xprofile_data_value_before_save', 'xprofile_sanitize_data_value_before_save', 1, 2 );
</del><ins>+add_filter( 'xprofile_data_value_before_save', 'xprofile_sanitize_data_value_before_save', 1, 2 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * xprofile_filter_kses ( $content )
+ *
+ * Run profile field values through kses with filterable allowed tags.
+ *
+ * @param string $content
+ * @return string $content
+ */
+function xprofile_filter_kses( $content ) {
+ global $allowedtags;
+
+ $xprofile_allowedtags = $allowedtags;
+ $xprofile_allowedtags['a']['rel'] = array();
+
+ $xprofile_allowedtags = apply_filters( 'xprofile_allowed_tags', $xprofile_allowedtags );
+ return wp_kses( $content, $xprofile_allowedtags );
+}
+
+/**
</ins><span class="cx"> * xprofile_sanitize_data_value_before_save ( $field_value, $field_id )
</span><span class="cx"> *
</span><span class="cx"> * Safely runs profile field data through kses and force_balance_tags.
</span><span class="lines">@@ -57,14 +76,18 @@
</span><span class="cx">
</span><span class="cx"> // Filter single value
</span><span class="cx"> if ( !is_array( $field_value ) ) {
</span><del>- $kses_field_value = wp_filter_kses( $field_value );
- $filtered_field_value = force_balance_tags( $kses_field_value );
</del><ins>+ $kses_field_value = xprofile_filter_kses( $field_value );
+ $filtered_field_value = wp_rel_nofollow( force_balance_tags( $kses_field_value ) );
+ $filtered_field_value = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_field_value, $field_value );
</ins><span class="cx">
</span><span class="cx"> // Filter each array item independently
</span><span class="cx"> } else {
</span><ins>+ $filtered_values = array();
</ins><span class="cx"> foreach ( (array)$field_value as $value ) {
</span><del>- $kses_field_value = wp_filter_kses( $value );
- $filtered_values[] = force_balance_tags( $kses_field_value );
</del><ins>+ $kses_field_value = xprofile_filter_kses( $value );
+ $filtered_value = wp_rel_nofollow( force_balance_tags( $kses_field_value ) );
+ $filtered_values[] = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_value, $value );
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $filtered_field_value = serialize( $filtered_values );
</span><span class="lines">@@ -105,7 +128,7 @@
</span><span class="cx"> if ( count( explode( ' ', $value ) ) > 5 ) {
</span><span class="cx"> $new_values[] = $value;
</span><span class="cx"> } else {
</span><del>- $new_values[] = '<a href="' . site_url( BP_MEMBERS_SLUG ) . '/?s=' . strip_tags( $value ) . '">' . $value . '</a>';
</del><ins>+ $new_values[] = '<a href="' . site_url( BP_MEMBERS_SLUG ) . '/?s=' . strip_tags( $value ) . '" rel="nofollow">' . $value . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-templatetags.php (3559 => 3560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-templatetags.php 2010-12-22 01:38:07 UTC (rev 3559)
+++ trunk/bp-xprofile/bp-xprofile-templatetags.php 2010-12-22 13:48:36 UTC (rev 3560)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> for ( $i = 0; $i < count( $this->group->fields ); $i++ ) {
</span><span class="cx"> $field = &$this->group->fields[$i];
</span><span class="cx">
</span><del>- if ( $field->data->value != null ) {
</del><ins>+ if ( !empty( $field->data ) && $field->data->value != null ) {
</ins><span class="cx"> $has_data = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -440,7 +440,9 @@
</span><span class="cx">
</span><span class="cx"> $option_values = maybe_unserialize($option_values);
</span><span class="cx">
</span><ins>+ $html = '';
</ins><span class="cx"> for ( $k = 0; $k < count($options); $k++ ) {
</span><ins>+ $selected = '';
</ins><span class="cx"> for ( $j = 0; $j < count($option_values); $j++ ) {
</span><span class="cx"> if ( $option_values[$j] == $options[$k]->name || @in_array( $options[$k]->name, $value ) || $options[$k]->is_default_option ) {
</span><span class="cx"> $selected = ' checked="checked"';
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (3559 => 3560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-12-22 01:38:07 UTC (rev 3559)
+++ trunk/bp-xprofile.php 2010-12-22 13:48:36 UTC (rev 3560)
</span><span class="lines">@@ -839,7 +839,7 @@
</span><span class="cx"> function xprofile_sync_wp_profile( $user_id = false ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( (int)$bp->site_options['bp-disable-profile-sync'] )
</del><ins>+ if ( !empty( $bp->site_options['bp-disable-profile-sync'] ) && (int)$bp->site_options['bp-disable-profile-sync'] )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if ( empty( $user_id ) )
</span></span></pre>
</div>
</div>
</body>
</html>