<!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][8645] trunk/src/bp-xprofile/bp-xprofile-filters.php: Clean up brackets, whitespace, and code formatting in `bp-xprofile-filters.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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8645">8645</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-07-17 19:59:53 +0000 (Thu, 17 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up brackets, whitespace, and code formatting in `bp-xprofile-filters.php`. Also remove a rogue unused filter that should have been removed in <a href="http://buddypress.trac.wordpress.org/changeset/3248">r3248</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofilefiltersphp">trunk/src/bp-xprofile/bp-xprofile-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofilefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-filters.php (8644 => 8645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-filters.php 2014-07-17 19:43:14 UTC (rev 8644)
+++ trunk/src/bp-xprofile/bp-xprofile-filters.php 2014-07-17 19:59:53 UTC (rev 8645)
</span><span class="lines">@@ -26,6 +26,9 @@
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'make_clickable' );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'esc_html', 8 );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_value', 'convert_smilies', 9 );
</span><ins>+add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value', 1, 2 );
+add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value_by_type', 8, 2 );
+add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 9, 2 );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_edit_value', 'force_balance_tags' );
</span><span class="cx"> add_filter( 'bp_get_the_profile_field_edit_value', 'esc_html' );
</span><span class="lines">@@ -46,12 +49,7 @@
</span><span class="cx"> add_filter( 'xprofile_field_description_before_save', 'force_balance_tags' );
</span><span class="cx">
</span><span class="cx"> add_filter( 'xprofile_get_field_data', 'stripslashes' );
</span><del>-
-add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value', 1, 2 );
-add_filter( 'bp_get_the_site_member_profile_data', 'xprofile_filter_format_field_value', 1, 2 );
</del><span class="cx"> add_filter( 'xprofile_get_field_data', 'xprofile_filter_format_field_value_by_field_id', 5, 2 );
</span><del>-add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value_by_type', 8, 2 );
-add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 9, 2 );
</del><span class="cx">
</span><span class="cx"> add_filter( 'xprofile_data_value_before_save', 'xprofile_sanitize_data_value_before_save', 1, 2 );
</span><span class="cx"> add_filter( 'xprofile_filtered_data_value_before_save', 'trim', 2 );
</span><span class="lines">@@ -82,7 +80,7 @@
</span><span class="cx"> * @param bool $reserialize Whether to reserialize arrays before returning. Defaults to true
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function xprofile_sanitize_data_value_before_save ( $field_value, $field_id, $reserialize = true ) {
</del><ins>+function xprofile_sanitize_data_value_before_save( $field_value, $field_id = 0, $reserialize = true ) {
</ins><span class="cx">
</span><span class="cx"> // Return if empty
</span><span class="cx"> if ( empty( $field_value ) ) {
</span><span class="lines">@@ -108,10 +106,11 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $reserialize ) )
</del><ins>+ if ( !empty( $reserialize ) ) {
</ins><span class="cx"> $filtered_field_value = serialize( $filtered_values );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $filtered_field_value = $filtered_values;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $filtered_field_value;
</span><span class="lines">@@ -127,12 +126,14 @@
</span><span class="cx"> * @return string $field_value Filtered XProfile field_value. False on failure.
</span><span class="cx"> */
</span><span class="cx"> function xprofile_filter_format_field_value( $field_value, $field_type = '' ) {
</span><ins>+
</ins><span class="cx"> // Valid field values of 0 or '0' get caught by empty(), so we have an extra check for these. See #BP5731
</span><del>- if ( ! isset( $field_value ) || empty( $field_value ) && '0' != $field_value )
</del><ins>+ if ( ! isset( $field_value ) || empty( $field_value ) && ( '0' !== $field_value ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( 'datebox' != $field_type ) {
- $field_value = str_replace(']]>', ']]>', $field_value );
</del><ins>+ if ( 'datebox' !== $field_type ) {
+ $field_value = str_replace( ']]>', ']]>', $field_value );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return stripslashes( $field_value );
</span><span class="lines">@@ -175,11 +176,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function xprofile_filter_link_profile_data( $field_value, $field_type = 'textbox' ) {
</span><del>- if ( 'datebox' == $field_type )
</del><ins>+
+ if ( 'datebox' === $field_type ) {
</ins><span class="cx"> return $field_value;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( !strpos( $field_value, ',' ) && ( count( explode( ' ', $field_value ) ) > 5 ) )
</del><ins>+ if ( !strpos( $field_value, ',' ) && ( count( explode( ' ', $field_value ) ) > 5 ) ) {
</ins><span class="cx"> return $field_value;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $values = explode( ',', $field_value );
</span><span class="cx">
</span><span class="lines">@@ -222,7 +226,8 @@
</span><span class="cx"> * @param int $post_id
</span><span class="cx"> * @return array $comments
</span><span class="cx"> */
</span><del>-function xprofile_filter_comments( $comments, $post_id ) {
</del><ins>+function xprofile_filter_comments( $comments, $post_id = 0 ) {
+
</ins><span class="cx"> // Locate comment authors with WP accounts
</span><span class="cx"> foreach( (array) $comments as $comment ) {
</span><span class="cx"> if ( $comment->user_id ) {
</span><span class="lines">@@ -260,13 +265,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> *
</span><del>- * @global BuddyPress $bp
- * @global WPDB $wpdb
</del><span class="cx"> * @param BP_User_Query $user_query
</span><span class="cx"> * @param string $user_ids_sql
</span><span class="cx"> */
</span><del>-function bp_xprofile_filter_user_query_populate_extras( BP_User_Query $user_query, $user_ids_sql ) {
- global $bp, $wpdb;
</del><ins>+function bp_xprofile_filter_user_query_populate_extras( BP_User_Query $user_query, $user_ids_sql = '' ) {
</ins><span class="cx">
</span><span class="cx"> if ( ! bp_is_active( 'xprofile' ) ) {
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>