<!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][10160] trunk/src: Code Standards: fix space indentations</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10160">10160</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10160","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-30 11:42:33 +0000 (Wed, 30 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Code Standards: fix space indentations</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunksrcbpcorebpcoreadminphp">trunk/src/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpmediaextractorphp">trunk/src/bp-core/classes/class-bp-media-extractor.php</a></li>
<li><a href="#trunksrcbpcorejsavatarjs">trunk/src/bp-core/js/avatar.js</a></li>
<li><a href="#trunksrcbpcorejscoverimagejs">trunk/src/bp-core/js/cover-image.js</a></li>
<li><a href="#trunksrcbpfriendsclassesclassbpfriendsfriendshipphp">trunk/src/bp-friends/classes/class-bp-friends-friendship.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsactionsphp">trunk/src/bp-groups/bp-groups-actions.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacycsstwentythirteenscss">trunk/src/bp-templates/bp-legacy/css/twentythirteen.scss</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-template.php 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-activity/bp-activity-template.php 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2925,7 +2925,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $link The activity thread permalink.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'bp_get_activity_thread_permalink', $link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'bp_get_activity_thread_permalink', $link );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-admin.php 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-core/bp-core-admin.php 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,17 +319,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Hide toolbar for logged out users setting
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_field( 'hide-loggedout-adminbar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_admin_bar', 'buddypress', 'bp_main' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_setting( 'buddypress', 'hide-loggedout-adminbar', 'intval' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_setting( 'buddypress', 'hide-loggedout-adminbar', 'intval' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only show 'switch to Toolbar' option if the user chose to retain the BuddyBar during the 1.6 upgrade
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (bool) bp_get_option( '_bp_force_buddybar', false ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_field( '_bp_force_buddybar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_force_buddybar', 'buddypress', 'bp_main' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_setting( 'buddypress', '_bp_force_buddybar', 'bp_admin_sanitize_callback_force_buddybar' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_setting( 'buddypress', '_bp_force_buddybar', 'bp_admin_sanitize_callback_force_buddybar' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow account deletion
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_field( 'bp-disable-account-deletion', __( 'Account Deletion', 'buddypress' ), 'bp_admin_setting_callback_account_deletion', 'buddypress', 'bp_main' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- register_setting( 'buddypress', 'bp-disable-account-deletion', 'intval' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_setting( 'buddypress', 'bp-disable-account-deletion', 'intval' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** XProfile Section **************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpmediaextractorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-media-extractor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-media-extractor.php 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-core/classes/class-bp-media-extractor.php 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,7 +468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Match any registered WordPress shortcodes.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $richtext, '[' ) !== false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match_all( '/' . get_shortcode_regex() . '/s', $richtext, $matches );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match_all( '/' . get_shortcode_regex() . '/s', $richtext, $matches );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $matches[2] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $matches[2] as $i => $shortcode_name ) {
</span></span></pre></div>
<a id="trunksrcbpcorejsavatarjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/js/avatar.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/js/avatar.js 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-core/js/avatar.js 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Display it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- avatarStatus.inject( '.bp-avatar-status' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ avatarStatus.inject( '.bp-avatar-status' );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> cropView: function() {
</span></span></pre></div>
<a id="trunksrcbpcorejscoverimagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/js/cover-image.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/js/cover-image.js 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-core/js/cover-image.js 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Display it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- coverImageUploadProgress.inject( '.bp-cover-image-status' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ coverImageUploadProgress.inject( '.bp-cover-image-status' );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> deleteView: function() {
</span></span></pre></div>
<a id="trunksrcbpfriendsclassesclassbpfriendsfriendshipphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-friends/classes/class-bp-friends-friendship.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-friends/classes/class-bp-friends-friendship.php 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-friends/classes/class-bp-friends-friendship.php 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", bp_core_current_time(), $friendship_id, bp_loggedin_user_id() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", bp_core_current_time(), $friendship_id, bp_loggedin_user_id() ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-actions.php 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-groups/bp-groups-actions.php 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Stop sole admins from abandoning their group
</span><span class="cx" style="display: block; padding: 0 10px"> $group_admins = groups_get_group_admins( bp_get_current_group_id() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == bp_loggedin_user_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == bp_loggedin_user_id() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'This group must have at least one admin', 'buddypress' ), 'error' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! groups_leave_group( $bp->groups->current_group->id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'There was an error leaving the group.', 'buddypress' ), 'error' );
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-groups/bp-groups-template.php 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3355,8 +3355,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $group->is_member ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Stop sole admins from abandoning their group
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $group_admins = groups_get_group_admins( $group->id );
- if ( ( 1 == count( $group_admins ) ) && ( bp_loggedin_user_id() === (int) $group_admins[0]->user_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group_admins = groups_get_group_admins( $group->id );
+ if ( ( 1 == count( $group_admins ) ) && ( bp_loggedin_user_id() === (int) $group_admins[0]->user_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3456,7 +3456,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the HTML button for joining a group.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.6
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.4.0 Added $group parameter to filter args.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.4.0 Added $group parameter to filter args.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $button HTML button for joining a group.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $group BuddyPress group object
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacycsstwentythirteenscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/css/twentythirteen.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/css/twentythirteen.scss 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-templates/bp-legacy/css/twentythirteen.scss 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1771,14 +1771,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> img {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // this is the tiny user avatar
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // this is the tiny user avatar
</ins><span class="cx" style="display: block; padding: 0 10px"> display: inline;
</span><span class="cx" style="display: block; padding: 0 10px"> height: 20px;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 0.5em;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 20px !important; // override inline style
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Sitewide Notices loop */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1959,7 +1959,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><span class="cx" style="display: block; padding: 0 10px"> text-transform: none;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 20%;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } // close form
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } // close .dir-search, .message-search
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php 2015-09-29 23:22:24 UTC (rev 10159)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php 2015-09-30 11:42:33 UTC (rev 10160)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,8 +383,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_ref_array( 'xprofile_field_after_save', array( $this ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Recreate type_obj in case someone changed $this->type via a filter
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->type_obj = bp_xprofile_create_field_type( $this->type );
- $this->type_obj->field_obj = $this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->type_obj = bp_xprofile_create_field_type( $this->type );
+ $this->type_obj->field_obj = $this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->id;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>