Ticket #2965: 2965.001.diff

bp-friends.php

@@ -571 +571 @@
 
 function friends_remove_data( $user_id ) {
         global $bp;
-        
+
         BP_Friends_Friendship::delete_all_for_user($user_id);
 
         /* Remove usermeta */

bp-activity.php

@@ -508 +508 @@
  *
  * @package BuddyPress Activity
  * @since 1.3
- * 
+ *
  * @param $content The content of the activity, usually found in $activity->content
  * @return array $usernames Array of the found usernames that match existing users
  */
 function bp_activity_find_mentions( $content ) {
         $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
         preg_match_all( $pattern, $content, $usernames );
-        
+
         // Make sure there's only one instance of each username
         if ( !$usernames = array_unique( $usernames[1] ) )
                 return false;
-                
+
         return $usernames;
 }
 
@@ -530 +530 @@
  *
  * @package BuddyPress Activity
  * @since 1.3
- * 
+ *
  * @param $activity_id The unique id for the activity item
  */
 function bp_activity_reduce_mention_count( $activity_id ) {
         $activity = new BP_Activity_Activity( $activity_id );
-        
-        if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) {     
+
+        if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) {
                 include_once( ABSPATH . WPINC . '/registration.php' );
-                
-                foreach( (array)$usernames as $username ) { 
+
+                foreach( (array)$usernames as $username ) {
                         if ( !$user_id = username_exists( $username ) )
                                 continue;
-        
+
                         // Decrease the number of new @ mentions for the user
                         $new_mention_count = (int)get_user_meta( $user_id, 'bp_new_mention_count', true );
                         update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count - 1 );
@@ -577 +577 @@
                                 return apply_filters( 'bp_activity_multiple_at_mentions_notification', '<a href="' . $at_mention_link . '" title="' . $at_mention_title . '">' . sprintf( __( 'You have %1$d new activity mentions', 'buddypress' ), (int)$total_items ) . '</a>', $at_mention_link, $total_items, $activity_id, $poster_user_id );
                         } else {
                                 $user_fullname = bp_core_get_user_displayname( $poster_user_id );
-                                
+
                                 return apply_filters( 'bp_activity_single_at_mentions_notification', '<a href="' . $at_mention_link . '" title="' . $at_mention_title . '">' . sprintf( __( '%1$s mentioned you in an activity update', 'buddypress' ), $user_fullname ) . '</a>', $at_mention_link, $total_items, $activity_id, $poster_user_id );
                         }
                 break;
@@ -998 +998 @@
                         $new_width = $new_height * $ratio;
 
                         $image = '<img src="' . esc_attr( $src ) . '" width="' . $new_width . '" height="' . $new_height . '" alt="' . __( 'Thumbnail', 'buddypress' ) . '" class="align-left thumbnail" />';
-                        
+
                         if ( !empty( $link ) ) {
                                 $image = '<a href="' . $link . '">' . $image . '</a>';
                         }
@@ -1223 +1223 @@
 
 /**
  * updates_register_activity_actions()
- * 
+ *
  * Register the activity stream actions for updates
- * 
+ *
  * @global array $bp
  */
 function updates_register_activity_actions() {

bp-themes/bp-default/groups/single/admin.php

@@ -199 +199 @@
 
                                                 <h5>
                                                         <?php bp_group_member_link() ?>
-                                                        
+
                                                         <?php if ( bp_get_group_member_is_banned() ) _e( '(banned)', 'buddypress'); ?>
 
-                                                        <span class="small"> - 
-                                                        
+                                                        <span class="small"> -
+
                                                         <?php if ( bp_get_group_member_is_banned() ) : ?>
-                                                                
+
                                                                 <a href="<?php bp_group_member_unban_link() ?>" class="confirm member-unban" title="<?php _e( 'Unban this member', 'buddypress' ) ?>"><?php _e( 'Remove Ban', 'buddypress' ); ?></a>
 
                                                         <?php else : ?>

bp-themes/bp-default/functions.php

@@ -488 +488 @@
  *
  * @deprecated 1.3
  * @deprecated No longer required.
- * @param string $template Absolute path to the page template 
+ * @param string $template Absolute path to the page template
  * @return string
  * @since 1.2
  */

bp-themes/bp-default/_inc/css/default.css

@@ -19 +19 @@
         margin: 0 auto;
         padding-top: 0 !important; /* Remove the top padding space for the admin bar in this theme */
 }
-        
+
 body.activity-permalink {
         min-width: 960px;
         max-width: 960px;
 }
 
-h1, 
-h2, 
-h3, 
-h4, 
-h5, 
+h1,
+h2,
+h3,
+h4,
+h5,
 h6 {
         margin: 5px 0 15px 0;
 }
 
-h1 { 
-        font-size: 28px; 
-        margin-bottom: 25px; 
+h1 {
+        font-size: 28px;
+        margin-bottom: 25px;
 }
 
-h2 { 
-        font-size: 24px; 
-        margin-bottom: 20px; 
+h2 {
+        font-size: 24px;
+        margin-bottom: 20px;
 }
 
-h3 { 
-        font-size: 20px; 
+h3 {
+        font-size: 20px;
 }
 
-h4 { 
-        font-size: 16px; 
-        margin-bottom: 15px; 
+h4 {
+        font-size: 16px;
+        margin-bottom: 15px;
 }
 
-h5 { 
-        font-size: 14px; 
-        margin-bottom: 0; 
+h5 {
+        font-size: 14px;
+        margin-bottom: 0;
 }
 
-h6 { 
-        font-size: 12px; 
-        margin-bottom: 0; 
+h6 {
+        font-size: 12px;
+        margin-bottom: 0;
 }
 
-a { 
-        color: #1fb3dd; 
+a {
+        color: #1fb3dd;
 }
 
-a:hover, 
-a:active { 
-        color: #888; 
+a:hover,
+a:active {
+        color: #888;
 }
 
-a:focus { 
-        outline: 1px dotted #ccc; 
+a:focus {
+        outline: 1px dotted #ccc;
 }
 
-.padder { 
-        padding: 19px; 
+.padder {
+        padding: 19px;
 }
 
-.clear { 
-        clear: left; 
+.clear {
+        clear: left;
 }
 
-p {     
-        margin-bottom: 15px; 
+p {
+        margin-bottom: 15px;
 }
 
-p:last-child { 
-        margin-bottom: 0; 
+p:last-child {
+        margin-bottom: 0;
 }
 
 hr {
@@ -127 +127 @@
         height: 0;
         line-height: 1;
         vertical-align: baseline;
-        position: relative;     
+        position: relative;
 }
 
 
@@ -153 +153 @@
         height: 100px;
         padding-top: 25px;
 }
-        
+
 #header #search-bar {
         position: absolute;
         top: 25px;
@@ -192 +192 @@
         width: 44%;
         margin: 0 0 -5px 0;
 }
-                
+
 #header h1 a {
         color: #fff;
         font-size: 26px;
@@ -212 +212 @@
         bottom: 0;
         max-width: 65%;
 }
-        
+
 ul#nav li {
         float: left;
         margin: 0 5px 0 0;
 }
-                
+
 ul#nav li a {
         display: block;
         color: #fff;
@@ -229 +229 @@
         -moz-border-radius-topright: 3px;
         -webkit-border-top-right-radius: 3px;
 }
-                        
-ul#nav li.selected a, 
+
+ul#nav li.selected a,
 ul#nav li.current_page_item a {
         background: #f5f5f5;
         color: #555;
 }
-                        
-ul#nav a:focus { 
-        outline: none; 
+
+ul#nav a:focus {
+        outline: none;
 }
 
 /* > Container
@@ -253 +253 @@
         overflow: hidden;
         margin-bottom: 20px;
 }
-        
+
 body.activity-permalink div#container {
         background: none;
         border: none;
@@ -273 +273 @@
         -webkit-border-top-right-radius: 3px;
         background: url( ../images/sidebar_back.gif ) top left repeat-x;
 }
-        
+
 div#sidebar div#sidebar-me img.avatar {
         float: left;
         margin: 0 10px 15px 0;
@@ -289 +289 @@
         clear: left;
         margin: 15px -16px;
 }
-                
+
 div#sidebar ul#bp-nav li {
         padding: 10px 15px;
 }
@@ -306 +306 @@
 div#sidebar .widget_search {
         margin-top: 20px;
 }
-                
+
 #footer-widget-area .widget_search input[type=text],
 div#sidebar .widget_search input[type=text] {
         width: 110px;
         padding: 2px;
 }
 
-#footer-widget-area ul#recentcomments li, 
+#footer-widget-area ul#recentcomments li,
 #footer-widget-area .widget_recent_entries ul li,
-div#sidebar ul#recentcomments li, 
+div#sidebar ul#recentcomments li,
 div#sidebar .widget_recent_entries ul li {
         margin-bottom: 15px;
 }
@@ -326 +326 @@
         height: 20px;
         margin-right: 10px;
 }
-                
+
 #footer-widget-area div.item-avatar img,
 div#sidebar div.item-avatar img {
         width: 40px;
@@ -335 +335 @@
 }
 
 #footer-widget-area .avatar-block,
-div#sidebar .avatar-block { 
-        overflow: hidden; 
+div#sidebar .avatar-block {
+        overflow: hidden;
 }
 
 #footer-widget-area ul.item-list div.item-title,
@@ -352 +352 @@
         font-size: 11px;
 }
 
-#footer-widget-area div.item-meta, 
+#footer-widget-area div.item-meta,
 #footer-widget-area div.item-content,
-div#sidebar div.item-meta, 
+div#sidebar div.item-meta,
 div#sidebar div.item-content {
         margin-left: 38px;
         font-size: 11px;
@@ -386 +386 @@
         -moz-border-radius-bottomleft: 6px;
         -webkit-border-bottom-left-radius: 6px;
 }
-        
+
 div#content .one-column {
         margin-right: 0;
         border-right: 0 none;
@@ -409 +409 @@
         overflow: hidden;
 }
 
-div#item-header div#item-header-content { 
-        margin-left: 170px; 
+div#item-header div#item-header-content {
+        margin-left: 170px;
 }
 
 div#item-header h2 {
@@ -418 +418 @@
         margin: 0 0 15px 0;
         line-height: 120%;
 }
-                
+
 div#item-header h2 a {
         text-decoration: none;
         color: #777;
@@ -429 +429 @@
         margin: 0 15px 25px 0;
 }
 
-div#item-header h2 { 
-        margin-bottom: 5px; 
+div#item-header h2 {
+        margin-bottom: 5px;
 }
 
-div#item-header span.activity, 
+div#item-header span.activity,
 div#item-header h2 span.highlight {
         vertical-align: middle;
         font-size: 11px;
@@ -442 +442 @@
         margin-bottom: 7px;
 }
 
-div#item-header h2 span.highlight { 
-        font-size: 16px; 
+div#item-header h2 span.highlight {
+        font-size: 16px;
 }
 
 div#item-header h2 span.highlight span {
@@ -477 +477 @@
         margin: 0 0 15px 15px;
         text-align: right;
 }
-                
+
 div#item-header div#item-actions h3 {
         font-size: 12px;
         margin: 0 0 5px 0;
@@ -488 +488 @@
         margin-bottom: 15px;
 }
 
-div#item-header ul h5, 
-div#item-header ul span, 
+div#item-header ul h5,
+div#item-header ul span,
 div#item-header ul hr {
         display: none;
 }
@@ -498 +498 @@
         float: right;
 }
 
-div#item-header ul img.avatar, 
+div#item-header ul img.avatar,
 div#item-header ul.avatars img.avatar {
         width: 30px;
         height: 30px;
         margin: 2px;
 }
 
-div#item-header div.generic-button, 
+div#item-header div.generic-button,
 div#item-header a.button {
         float: left;
         margin: 10px 10px 0 0;
@@ -522 +522 @@
 ul.item-list {
         width: 100%;
 }
-        
+
 ul.item-list li {
         position: relative;
         padding: 15px 0;
         border-bottom: 1px solid #eaeaea;
 }
-                
-ul.single-line li { 
-        border: none; 
+
+ul.single-line li {
+        border: none;
 }
 
 ul.item-list li img.avatar {
@@ -538 +538 @@
         margin: 0 10px 10px 0;
 }
 
-ul.item-list li div.item-title, 
+ul.item-list li div.item-title,
 ul.item-list li h4 {
         font-weight: normal;
         font-size: 14px;
         width: 75%;
         margin: 0;
 }
-                        
+
 ul.item-list li div.item-title span {
         font-size: 12px;
         color: #999;
@@ -586 +586 @@
         margin: 25px -19px 20px -19px;
         background: #eaeaea;
 }
-        
+
 div.item-list-tabs ul li a {
         text-decoration: none;
 }
@@ -594 +594 @@
 div.item-list-tabs ul {
         width: 100%;
 }
-                
+
 div.item-list-tabs ul li {
         float: left;
         margin: 5px 0 0 5px;
 }
-                        
+
 div.item-list-tabs#subnav ul li {
         margin-top: 0;
 }
@@ -612 +612 @@
         float: right;
         margin: 7px 20px 0 0;
 }
-                                
+
 div.item-list-tabs#subnav ul li.last {
         margin-top: 4px;
 }
@@ -627 +627 @@
         padding: 5px 10px;
         text-decoration: none;
 }
-                        
+
 div.item-list-tabs ul li span {
         color: #aaa;
 }
@@ -648 +648 @@
         -moz-border-radius-topright: 3px;
         -webkit-border-top-right-radius: 3px;
 }
-                        
+
 ul li.loading a {
         background-image: url( ../images/ajax-loader.gif );
         background-position: 92% 50%;
         background-repeat: no-repeat;
         padding-right: 30px !important;
 }
-                                
+
 div#item-nav ul li.loading a {
         background-position: 88% 50%;
 }
@@ -685 +685 @@
         margin: 20px 0;
 }
 
-span.activity, 
+span.activity,
 div#message p {
         display: inline-block;
         font-size: 11px;
@@ -710 +710 @@
         float: right;
         margin: -37px 0 0 0;
 }
-        
+
 div.dir-search input[type=text] {
         padding: 4px;
         font-size: 12px;
@@ -728 +728 @@
         font-size: 11px;
         height: 16px;
 }
-        
-div.pagination#user-pag, 
+
+div.pagination#user-pag,
 .friends div.pagination,
-.mygroups div.pagination, 
-.myblogs div.pagination, 
+.mygroups div.pagination,
+.myblogs div.pagination,
 noscript div.pagination {
         background: #f8f8f8;
         border: none;
@@ -746 +746 @@
 div.pagination .pagination-links {
         float: right;
 }
-                
+
 div.pagination .pagination-links span,
 div.pagination .pagination-links a {
         font-size: 12px;
         padding: 0 5px;
 }
-                        
+
 div.pagination .pagination-links a:hover {
         font-weight: bold;
 }
@@ -768 +768 @@
 div#message {
         margin: 15px 0;
 }
-        
+
 div#message.updated {
-        clear: both; 
+        clear: both;
 }
 
 div#message p {
@@ -778 +778 @@
         font-size: 12px;
         display:block;
 }
-        
+
 div#message.error p {
         background: #e41717;
         color: #fff;
@@ -807 +807 @@
 /* > Buttons
 -------------------------------------------------------------- */
 
-a.button, 
-input[type=submit], 
-input[type=button], 
+a.button,
+input[type=submit],
+input[type=button],
 input[type=reset],
-ul.button-nav li a, 
+ul.button-nav li a,
 div.generic-button a {
         background: url( ../images/white-grad.png ) top left repeat-x;
         border: 1px solid #ddd;
@@ -826 +826 @@
         vertical-align: bottom;
         cursor: pointer;
 }
-        
-a.button:hover, 
-a.button:focus, 
-input[type=submit]:hover, 
-input[type=button]:hover, 
+
+a.button:hover,
+a.button:focus,
+input[type=submit]:hover,
+input[type=button]:hover,
 input[type=reset]:hover,
-ul.button-nav li a:hover, 
+ul.button-nav li a:hover,
 ul.button-nav li.current a,
 div.generic-button a:hover {
         border-color: #aaa;
@@ -846 +846 @@
         color: #bbb;
         cursor: default;
 }
-        
-div.pending a:hover, 
-a.disabled:hover { 
-        border-color: #eee; 
-        color: #bbb; 
+
+div.pending a:hover,
+a.disabled:hover {
+        border-color: #eee;
+        color: #bbb;
 }
 
-div.accept, 
+div.accept,
 div.reject {
         float: left;
         margin-left: 10px;
@@ -863 +863 @@
         float: left;
         margin: 0 10px 10px 0;
 }
-        
+
 ul.button-nav li.current a {
         font-weight: bold;
 }
@@ -887 +887 @@
 /* > Input Forms
 -------------------------------------------------------------- */
 
-form.standard-form textarea, 
+form.standard-form textarea,
 form.standard-form input[type=text],
-form.standard-form select, 
+form.standard-form select,
 form.standard-form input[type=password],
 .dir-search input[type=text] {
         border: 1px inset #ccc;
@@ -901 +901 @@
         font-size: 14px;
         color: #888;
 }
-                
+
 form.standard-form select {
         padding: 3px;
 }
@@ -910 +910 @@
         margin-bottom: 5px;
 }
 
-form.standard-form label, 
+form.standard-form label,
 form.standard-form span.label {
         display: block;
         font-weight: bold;
         margin: 15px 0 5px 0;
 }
-                
+
 form.standard-form div.checkbox label,
 form.standard-form div.radio label {
         font-weight: normal;
@@ -932 +932 @@
 form.standard-form input[type=text] {
         width: 75%;
 }
-                
+
 form.standard-form#sidebar-login-form input[type=text],
 form.standard-form#sidebar-login-form input[type=password] {
         padding: 4px;
@@ -948 +948 @@
 form.standard-form#signup_form textarea {
         width: 90%;
 }
-                        
+
 form.standard-form#signup_form div.submit {
-        float: right; 
+        float: right;
 }
 
-div#signup-avatar img { 
-        margin: 0 15px 10px 0; 
+div#signup-avatar img {
+        margin: 0 15px 10px 0;
 }
-        
+
 form.standard-form textarea {
         width: 75%;
         height: 120px;
 }
-                
+
 form.standard-form textarea#message_content {
         height: 200px;
 }
@@ -980 +980 @@
         padding: 15px 0;
         clear: both;
 }
-                
+
 form.standard-form div.submit input {
         margin-right: 15px;
 }
@@ -989 +989 @@
         margin: 10px 0 15px 38px;
         list-style: disc;
 }
-                
+
 form.standard-form div.radio ul li {
         margin-bottom: 5px;
 }
@@ -1000 +1000 @@
         outline: none;
 }
 
-form.standard-form #basic-details-section, 
+form.standard-form #basic-details-section,
 form.standard-form #blog-details-section,
 form.standard-form #profile-details-section {
         float: left;
         width: 48%;
 }
-        
-form.standard-form #profile-details-section { 
-        float: right; 
+
+form.standard-form #profile-details-section {
+        float: right;
 }
 
 form.standard-form #blog-details-section {
         clear: left;
 }
 
-form.standard-form input:focus, 
-form.standard-form textarea:focus, 
+form.standard-form input:focus,
+form.standard-form textarea:focus,
 form.standard-form select:focus {
         background: #fafafa;
         color: #555;
@@ -1025 +1025 @@
 form#send-invite-form {
         margin-top: 20px;
 }
-        
+
 div#invite-list {
         height: 400px;
         overflow: scroll;
@@ -1046 +1046 @@
 table {
         width: 100%;
 }
-        
+
 table thead tr {
         background: #eaeaea;
 }
@@ -1057 +1057 @@
 }
 
 table.profile-fields {
-        margin-bottom: 20px; 
+        margin-bottom: 20px;
 }
 
 div#sidebar table {
@@ -1069 +1069 @@
         padding: 8px;
         vertical-align: middle;
 }
-                
+
 table tr td.label {
         border-right: 1px solid #eaeaea;
         font-weight: bold;
         width: 25%;
 }
-                
-table tr td.thread-info p { 
-        margin: 0; 
+
+table tr td.thread-info p {
+        margin: 0;
 }
 
 table tr td.thread-info p.thread-excerpt {
@@ -1085 +1085 @@
         font-size: 11px;
         margin-top: 3px;
 }
-        
+
 div#sidebar table td,
-table.forum td { 
-        text-align: center; 
+table.forum td {
+        text-align: center;
 }
 
 table tr.alt {
@@ -1099 +1099 @@
         margin-bottom: 20px;
         text-align: left;
 }
-        
-table.notification-settings th.icon, 
-table.notification-settings td:first-child { 
-        display: none; 
+
+table.notification-settings th.icon,
+table.notification-settings td:first-child {
+        display: none;
 }
 
-table.notification-settings th.title { 
-        width: 80%; 
+table.notification-settings th.title {
+        width: 80%;
 }
-        
-table.notification-settings .yes, 
-table.notification-settings .no { 
-        width: 40px; 
-        text-align: center; 
+
+table.notification-settings .yes,
+table.notification-settings .no {
+        width: 40px;
+        text-align: center;
 }
 
 table.forum {
         margin: -9px -20px 20px -20px;
         width: auto;
 }
-        
+
 table.forum tr.sticky td {
         background: #fff9db;
         border-top: 1px solid #ffe8C4;
@@ -1138 +1138 @@
         font-size: 11px;
 }
 
-table.forum tr > td:first-child, 
+table.forum tr > td:first-child,
 table.forum tr > th:first-child {
         padding-left: 15px;
 }
 
-table.forum tr > td:last-child, 
+table.forum tr > td:last-child,
 table.forum tr > th:last-child {
         padding-right: 15px;
 }
 
-table.forum tr th#th-title, 
+table.forum tr th#th-title,
 table.forum tr th#th-poster,
-table.forum tr th#th-group, 
+table.forum tr th#th-group,
 table.forum td.td-poster,
-table.forum td.td-group, 
-table.forum td.td-title { 
-        text-align: left; 
+table.forum td.td-group,
+table.forum td.td-title {
+        text-align: left;
 }
 
 table.forum td.td-freshness {
@@ -1226 +1226 @@
         -webkit-border-radius: 3px;
         border-radius: 3px;
 }
-        
+
 form#whats-new-form textarea {
         width: 100%;
         height: 50px;
@@ -1270 +1270 @@
         min-height: 35px;
         padding: 12px 0 0 0;
 }
-        
+
 .activity-list li.mini div.activity-meta {
         margin: 0;
 }
@@ -1285 +1285 @@
         height: 20px;
         margin-left: 36px;
 }
-                
+
 .activity-list li.activity_comment .activity-avatar img.avatar,
 .activity-list li.activity_comment .activity-avatar img.FB_profile_pic {
         width: 40px;
@@ -1313 +1313 @@
         position: absolute;
         right: 0;
 }
-        
+
 body.activity-permalink .activity-list li.mini .activity-meta {
         position: absolute;
         right: 15px;
@@ -1333 +1333 @@
         padding-left: 25px;
         background: url( ../images/replyto_arrow.gif ) 7px 0 no-repeat;
 }
-        
+
 .activity-list li .activity-inreplyto > p {
         margin: 0;
         display: inline;
@@ -1353 +1353 @@
         width: 50px;
         height: 50px;
 }
-                
+
 body.activity-permalink .activity-list .activity-avatar img {
         width: 100px;
         height: 100px;
@@ -1362 +1362 @@
 .activity-list .activity-content {
         margin-left: 70px;
 }
-        
+
 body.activity-permalink .activity-list li .activity-content {
         -moz-border-radius: 4px;
         -webkit-border-radius: 4px;
@@ -1377 +1377 @@
         min-height: 35px;
         margin-right: 0;
 }
-        
+
 body.activity-permalink .activity-list li .activity-header > p {
         background: url( ../images/activity_arrow.gif ) top left no-repeat;
         margin-left: -35px;
@@ -1392 +1392 @@
         color: #888;
         line-height: 220%;
 }
-        
+
 .activity-list .activity-content .activity-header img.avatar {
         float: none !important;
         margin: 0 5px -8px 0 !important;
@@ -1411 +1411 @@
         border-radius: 4px;
         margin-right: 3px;
 }
-        
+
 .activity-list .activity-header a:first-child:hover {
         background: #059ae7 !important;
         color: #fff !important;
 }
-                
-.activity-list .activity-content a:first-child:focus { 
-        outline: none; 
+
+.activity-list .activity-content a:first-child:focus {
+        outline: none;
 }
 
 .activity-list .activity-content span.time-since {
@@ -1434 +1434 @@
         color: #aaa;
         text-decoration: underline;
 }
-                
+
 .activity-list .activity-content span.activity-header-meta a:hover {
         color: inherit;
         text-decoration: none;
@@ -1445 +1445 @@
         margin: 15px 0 15px 5px;
         overflow: hidden;
 }
-                
+
 body.activity-permalink .activity-content .activity-inner,
 body.activity-permalink .activity-content blockquote {
         margin-top: 5px;
 }
 
 /* Backwards compatibility. */
-.activity-inner > .activity-inner { 
-        margin: 0 !important; 
+.activity-inner > .activity-inner {
+        margin: 0 !important;
 }
-                
-.activity-inner > blockquote { 
-        margin: 0 !important; 
+
+.activity-inner > blockquote {
+        margin: 0 !important;
 }
 
 .activity-list .activity-content img.thumbnail {
@@ -1478 +1478 @@
         -webkit-border-radius: 4px;
         border-radius: 4px;
 }
-        
+
 .activity-list li.load-more a {
         color: #555;
 }
@@ -1505 +1505 @@
         border-radius: 4px;
         margin-right: 3px;
 }
-        
+
 .activity-list div.activity-meta a.acomment-reply {
         background: #fff9db;
         border-bottom: 1px solid #ffe8c4;
@@ -1513 +1513 @@
         color: #ffa200;
 }
 
-div.activity-meta a:focus { 
-        outline: none; 
+div.activity-meta a:focus {
+        outline: none;
 }
-        
+
 div.activity-meta a:hover {
         background: #aaa;
         color: #fff;
         border-color: #aaa;
 }
-                
+
 div.activity-meta a.acomment-reply:hover {
         background: #f7740a;
         color: #fff;
@@ -1562 +1562 @@
         border-top: 2px solid #fff;
         padding: 10px 0 0;
 }
-                
+
 body.activity-permalink .activity-list li.mini .activity-comments {
         clear: none;
         margin-top: 0;
@@ -1589 +1589 @@
         margin-top: 0;
         margin-left: 20px;
 }
-                
+
 body.activity-permalink div.activity-comments ul li > ul {
         margin-top: 15px;
 }
@@ -1605 +1605 @@
         margin-left: 39px;
         margin-top: 5px;
 }
-                
-div.acomment-content .time-since { 
-        display: none; 
+
+div.acomment-content .time-since {
+        display: none;
 }
 
-div.acomment-content .activity-delete-link { 
-        display: none; 
+div.acomment-content .activity-delete-link {
+        display: none;
 }
-                
-div.acomment-content .comment-header { 
-        display: none; 
+
+div.acomment-content .comment-header {
+        display: none;
 }
 
 body.activity-permalink div.activity-comments div.acomment-content {
@@ -1637 +1637 @@
         border-radius: 4px;
         padding: 8px;
 }
-                
+
 div.activity-comments li form.ac-form {
         margin-right: 15px;
 }
@@ -1656 +1656 @@
         background-position: 2% 95%;
         background-repeat: no-repeat;
 }
-        
+
 div.activity-comments form .ac-textarea {
         padding: 8px;
         border: 1px inset #ccc;
@@ -1666 +1666 @@
         -webkit-border-radius: 3px;
         border-radius: 3px;
 }
-                        
+
 div.activity-comments form textarea {
         width: 100%;
         font-family: inherit;
@@ -1676 +1676 @@
         border: none;
         padding: 0;
 }
-                                
+
 div.activity-comments form input {
         margin-top: 5px;
 }
@@ -1684 +1684 @@
 div.activity-comments form div.ac-reply-avatar {
         float: left;
 }
-                        
+
 div.ac-reply-avatar img {
         border: 2px solid #fff !important;
 }
@@ -1711 +1711 @@
         background: #fff;
 }
 
-li span.unread-count, 
+li span.unread-count,
 tr.unread span.unread-count {
         background: #dd0000;
         padding: 2px 8px;
@@ -1721 +1721 @@
         -webkit-border-radius: 3px;
         border-radius: 3px;
 }
-                
+
 div.item-list-tabs ul li a span.unread-count {
         padding: 1px 6px;
         color: #fff;
@@ -1739 +1739 @@
         margin: 0 -20px;
         padding: 15px;
 }
-        
+
 div#message-thread div.alt {
         background: #f4f4f4;
 }
@@ -1758 +1758 @@
         margin: 0;
         font-size: 16px;
 }
-                
+
 div#message-thread strong a {
         text-decoration: none;
 }
@@ -1813 +1813 @@
         color: #888;
         font-size: 11px;
 }
-        
+
 div#topic-meta div.admin-links {
         bottom: 0;
         right: 0;
@@ -1824 +1824 @@
         position: relative;
         padding: 5px 0;
 }
-        
+
 div#topic-meta h3 {
-        font-size: 20px;        
+        font-size: 20px;
 }
 
 div#new-topic-post {
@@ -1843 +1843 @@
         overflow: hidden;
 }
 
-div.post h2.pagetitle, 
+div.post h2.pagetitle,
 div.post h2.posttitle {
         margin: 0;
         line-height: 120%;
 }
-                
-div.post h2.pagetitle a, 
+
+div.post h2.pagetitle a,
 div.post h2.posttitle a {
         color: #666;
         text-decoration: none;
 }
 
-.navigation, 
-.paged-navigation, 
+.navigation,
+.paged-navigation,
 .comment-navigation {
         overflow: hidden;
         font-family: georgia, times, serif;
@@ -1876 +1876 @@
         margin-right: 15px;
 }
 
-div.post p { 
-        margin: 0 0 20px 0; 
+div.post p {
+        margin: 0 0 20px 0;
 }
 
-div.post ul, 
-div.post ol, 
-div.post dl { 
-        margin: 0 0 18px 1.5em; 
+div.post ul,
+div.post ol,
+div.post dl {
+        margin: 0 0 18px 1.5em;
 }
-        
+
 div.post ul {
-        list-style: square; 
+        list-style: square;
 }
-        
-div.post ol { 
+
+div.post ol {
         list-style: decimal;
 }
-        
-div.post ol ol { 
-        list-style: upper-alpha; 
+
+div.post ol ol {
+        list-style: upper-alpha;
 }
-        
-div.post dl { 
-        margin-left: 0; 
+
+div.post dl {
+        margin-left: 0;
 }
-        
-div.post dt { 
-        font-size: 14px; 
-        font-weight: bold; 
+
+div.post dt {
+        font-size: 14px;
+        font-weight: bold;
 }
-        
-div.post dd { 
+
+div.post dd {
         margin: 0 0 15px 0;
 }
 
-div.post pre, 
+div.post pre,
 div.post code p {
         padding: 15px;
         background: #f4f4f4;
@@ -1921 +1921 @@
 }
 
 div.post code {
-        font-family: "Monaco", courier, sans-serif; 
+        font-family: "Monaco", courier, sans-serif;
 }
 
 div.post blockquote {
@@ -1938 +1938 @@
         border-spacing:0;
         border: 1px solid #eee;
 }
-                
+
 div.post table th {
-        border-top: 1px solid #eee; 
-        text-align: left; 
+        border-top: 1px solid #eee;
+        text-align: left;
 }
-                
-div.post table td { 
-        border-top: 1px solid #eee; 
+
+div.post table td {
+        border-top: 1px solid #eee;
 }
-        
-div.post div.author-box, 
+
+div.post div.author-box,
 div.comment-avatar-box {
         background: #f0f0f0;
         padding: 10px;
@@ -1962 +1962 @@
         -webkit-border-radius: 3px;
         border-radius: 3px;
 }
-                
-div.author-box p, 
-div.comment-avatar-box p { 
-        margin: 5px 0 0; 
+
+div.author-box p,
+div.comment-avatar-box p {
+        margin: 5px 0 0;
 }
-                
-div.author-box a, 
-div.comment-avatar-box a { 
-        text-decoration: none; 
+
+div.author-box a,
+div.comment-avatar-box a {
+        text-decoration: none;
 }
 
-div.post div.author-box img, 
+div.post div.author-box img,
 div.comment-avatar-box img {
         float: none;
         border: 4px solid #fff;
         margin: 0;
 }
 
-div.post div.post-content, 
+div.post div.post-content,
 div.comment-content {
         margin-left: 105px;
 }
 
-div.post p.date, div.post p.postmetadata, 
+div.post p.date, div.post p.postmetadata,
 div.comment-meta, div.comment-options {
         color: #888;
         font-size: 12px;
@@ -2002 +2002 @@
         overflow: hidden;
 }
 
-div.post .tags { 
-        float: left; 
+div.post .tags {
+        float: left;
 }
 
-div.post .comments { 
-        float: right; 
+div.post .comments {
+        float: right;
 }
 
-div.post img { 
-        margin-bottom: 15px; 
+div.post img {
+        margin-bottom: 15px;
 }
 
-div.post img.wp-smiley { 
-        padding: 0 !important; 
-        margin: 0 !important; 
-        border: none !important; 
-        float: none !important; 
-        clear: none !important; 
+div.post img.wp-smiley {
+        padding: 0 !important;
+        margin: 0 !important;
+        border: none !important;
+        float: none !important;
+        clear: none !important;
 }
 
 div.post img.centered, img.aligncenter {
@@ -2040 +2040 @@
         display: inline;
 }
 
-div.post .aligncenter, 
+div.post .aligncenter,
 div.post div.aligncenter {
         display: block;
         margin-left: auto;
@@ -2063 +2063 @@
         border: 0 none;
 }
 
-div.post dd.wp-caption p.wp-caption-text, 
+div.post dd.wp-caption p.wp-caption-text,
 div.post .wp-caption p.wp-caption-text {
         font-size: 0.9em;
         line-height: 17px;
@@ -2082 +2082 @@
         margin-top: 30px;
 }
 
-#comments h3, 
-#trackbacks h3, 
+#comments h3,
+#trackbacks h3,
 #respond h3 {
         font-size: 20px;
         margin: 5px 0 25px 0;
@@ -2091 +2091 @@
         color: #555;
 }
 
-#comments span.title, 
+#comments span.title,
 #trackbacks span.title {
         color: #aaa;
 }
@@ -2117 +2117 @@
         border-bottom: none;
 }
 
-ol.commentlist ul.children { 
-        margin-left: 105px; 
+ol.commentlist ul.children {
+        margin-left: 105px;
 }
 
 
@@ -2135 +2135 @@
         border-bottom: 1px solid #e0e0e0;
         background: #fff;
 }
-        
+
 #site-generator {
         text-align: center;
         color: #bbb;
@@ -2162 +2162 @@
         background: #eaeaea;
         padding: 5px 15px;
         font-size: 12px;
-        clear: left;    
+        clear: left;
 }
 
 #footer-widget-area div div.item-options {
@@ -2184 +2184 @@
         z-index: 99999;
         right: 0;
 }
-        
+
 #nav li:hover > ul {
         display: block;
 }

bp-themes/bp-default/_inc/ajax.php

@@ -567 +567 @@
         // Include everyone in the autocomplete, or just friends?
         if ( $bp->messages->slug == $bp->current_component )
                 $autocomplete_all = $bp->messages->autocomplete_all;
-        
+
         $friends = false;
 
         $limit = $_GET['limit'] ? $_GET['limit'] : apply_filters( 'bp_autocomplete_max_results', 10 );
@@ -575 +575 @@
         // Get the user ids based on the search terms
         if ( $autocomplete_all ) {
                 $users = BP_Core_User::search_users( $_GET['q'], $limit, $pag_page );
-                
+
                 if ( !empty( $users['users'] ) ) {
                         // Build an array with the correct format
                         $user_ids = array();
@@ -583 +583 @@
                                 if ( $user->id != $bp->loggedin_user->id )
                                         $user_ids[] = $user->id;
                         }
-                        
+
                         $user_ids = apply_filters( 'bp_core_autocomplete_ids', $user_ids, $_GET['q'], $limit );
                 }
         } else {
                 if ( function_exists( 'friends_search_friends' ) ) {
                         $users = friends_search_friends( $_GET['q'], $bp->loggedin_user->id, $limit, 1 );
-                        
+
                         // Keeping the bp_friends_autocomplete_list filter for backward compatibility
                         $users = apply_filters( 'bp_friends_autocomplete_list', $users, $_GET['q'], $limit );
-                        
+
                         if ( !empty( $users['friends'] ) )
                                 $user_ids = apply_filters( 'bp_friends_autocomplete_ids', $users['friends'], $_GET['q'], $limit );
                 }
         }
-        
 
+
         if ( $user_ids ) {
                 foreach ( $user_ids as $user_id ) {
                         $ud = get_userdata($user_id);

bp-themes/bp-default/_inc/global.js

@@ -824 +824 @@
         }).mouseout( function() {
                 jq(this).removeClass('over');
         });
-                
+
         jq('body#bp-default table.zebra tbody tr:odd').addClass('alt');
 
         jq('div.message-box').each( function(i) {

bp-themes/bp-default/registration/register.php

@@ -162 +162 @@
                                         <?php do_action( 'bp_after_signup_profile_fields' ) ?>
 
                                 <?php endif; ?>
-                                
+
                                 <?php if ( bp_get_blog_signup_allowed() ) : ?>
 
                                         <?php do_action( 'bp_before_blog_details_fields' ) ?>

bp-themes/bp-default/forums/index.php

@@ -115 +115 @@
                         <?php do_action( 'bp_after_directory_forums_content' ) ?>
 
                 </form>
-                
+
                 <?php do_action( 'bp_after_directory_forums' ) ?>
 
                 </div><!-- .padder -->

bp-themes/bp-default/comments.php

@@ -18 +18 @@
                                 $numTrackBacks = 0; $numComments = 0;
                                 foreach ( (array)$comments as $comment )
                                         if ( 'comment' != get_comment_type() )
-                                                $numTrackBacks++; 
+                                                $numTrackBacks++;
                                         else
                                                 $numComments++;
                         ?>

bp-xprofile/admin/js/admin.dev.js

@@ -12 +12 @@
 
         var label = document.createElement('label');
         label.setAttribute('for', forWhat + '_option' + theId);
-        
+
         var txt = document.createTextNode("Option " + theId + ": ");
         label.appendChild(txt);
-        
+
         var isDefault = document.createElement('input');
-        
+
         if(forWhat == 'checkbox' || forWhat == 'multiselectbox') {
                 isDefault.setAttribute('type', 'checkbox');
                 isDefault.setAttribute('name', 'isDefault_' + forWhat + '_option[' + theId + ']');
         } else {
                 isDefault.setAttribute('type', 'radio');
-                isDefault.setAttribute('name', 'isDefault_' + forWhat + '_option');                                     
+                isDefault.setAttribute('name', 'isDefault_' + forWhat + '_option');
         }
-        
+
         isDefault.setAttribute('value', theId);
-        
+
         var label1 = document.createElement('label');
         var txt1 = document.createTextNode(" Default Value ");
-        
+
         label1.appendChild(txt1);
         label1.setAttribute('for', 'isDefault_' + forWhat + '_option[]');
         toDelete = document.createElement('a');
-        
+
         toDeleteText = document.createTextNode('[x]');
         toDelete.setAttribute('href',"javascript:hide('" + forWhat + '_div' + theId + "')");
-        
+
         toDelete.setAttribute('class','delete');
 
         toDelete.appendChild(toDeleteText);
@@ -46 +46 @@
         newDiv.appendChild(newOption);
         newDiv.appendChild(document.createTextNode(" "));
         newDiv.appendChild(isDefault);
-        newDiv.appendChild(label1);     
-        newDiv.appendChild(toDelete);   
+        newDiv.appendChild(label1);
+        newDiv.appendChild(toDelete);
         holder.appendChild(newDiv);
-        
-        
+
+
         theId++
         document.getElementById(forWhat + "_option_number").value = theId;
 }
@@ -60 +60 @@
         document.getElementById("selectbox").style.display = "none";
         document.getElementById("multiselectbox").style.display = "none";
         document.getElementById("checkbox").style.display = "none";
-        
+
         if(forWhat == "radio")
                 document.getElementById("radio").style.display = "";
-        
+
         if(forWhat == "selectbox")
-                document.getElementById("selectbox").style.display = "";                                                
-        
+                document.getElementById("selectbox").style.display = "";
+
         if(forWhat == "multiselectbox")
-                document.getElementById("multiselectbox").style.display = "";                                           
-        
+                document.getElementById("multiselectbox").style.display = "";
+
         if(forWhat == "checkbox")
-                document.getElementById("checkbox").style.display = "";                                         
+                document.getElementById("checkbox").style.display = "";
 }
 
 function hide(id) {
         if ( !document.getElementById(id) ) return false;
-        
+
         document.getElementById(id).style.display = "none";
         document.getElementById(id).value = '';
 }
 
 // Set up deleting options ajax
 jQuery(document).ready( function() {
-        
-        jQuery("a.ajax-option-delete").click( 
+
+        jQuery("a.ajax-option-delete").click(
                 function() {
                         var theId = this.id.split('-');
                         theId = theId[1];
-                        
+
                         jQuery.post( ajaxurl, {
                                 action: 'xprofile_delete_option',
                                 'cookie': encodeURIComponent(document.cookie),
                                 '_wpnonce': jQuery("input#_wpnonce").val(),
-                                
+
                                 'option_id': theId
                         },
                         function(response)
                         {});
                 }
-        );                              
+        );
 });
 
 var fixHelper = function(e, ui) {
@@ -160 +160 @@
         .css( 'cursor', 'move' );
 
         /* tabs init with a custom tab template and an "add" callback filling in the content */
-        var $tab_items; 
+        var $tab_items;
         var $tabs = jQuery( "#tabs" ).tabs();
         set_tab_items( $tabs );
 

bp-xprofile/bp-xprofile-classes.php

@@ -760 +760 @@
         function exists() {
                 global $wpdb, $bp;
 
-                
+
                 $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 ) );
 
                 return apply_filters( 'xprofile_data_exists', (bool)$retval, $this );

bp-core/bp-core-signup.php

@@ -15 +15 @@
                 return false;
 
         $bp->is_directory = false;
-        
+
         if ( bp_is_component_front_page( 'register' ) && ( is_user_logged_in() || !bp_get_signup_allowed() ) )
                 bp_core_redirect( $bp->root_domain . '/' . $bp->members->slug );
 
@@ -325 +325 @@
 
         if ( defined( 'BP_ACTIVATION_SLUG' ) )
                 $bp_component_slugs[] = BP_ACTIVATION_SLUG;
-        
+
         // Add our slugs to the array and allow them to be filtered
         $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
 
@@ -634 +634 @@
         $message = apply_filters( 'bp_core_activation_signup_user_notification_message', $message, $user_id );
 
         wp_mail( $to, $subject, $message, $message_headers );
-        
+
         do_action( 'bp_core_sent_user_validation_email', $admin_email, $subject, $message, $user_id, $user_email, $key );
 }
 

bp-core/bp-core-widgets.php

@@ -63 +63 @@
                                                                 <span class="activity">
                                                                 <?php
                                                                         if ( 'newest' == $instance['member_default'] )
-                                                                                bp_member_registered();                                                         
+                                                                                bp_member_registered();
                                                                         if ( 'active' == $instance['member_default'] )
                                                                                 bp_member_last_active();
                                                                         if ( 'popular' == $instance['member_default'] )
@@ -107 +107 @@
                         'member_default' => 'active'
                 );
                 $instance = wp_parse_args( (array) $instance, $defaults );
-                
+
                 $title = strip_tags( $instance['title'] );
                 $max_members = strip_tags( $instance['max_members'] );
                 $member_default = strip_tags( $instance['member_default'] );
@@ -116 +116 @@
                 <p><label for="bp-core-widget-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
 
                 <p><label for="bp-core-widget-members-max"><?php _e('Max members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
-                                
+
                 <p>
-                        <label for="bp-core-widget-groups-default"><?php _e('Default members to show:', 'buddypress'); ?> 
+                        <label for="bp-core-widget-groups-default"><?php _e('Default members to show:', 'buddypress'); ?>
                         <select name="<?php echo $this->get_field_name( 'member_default' ) ?>">
                                 <option value="newest" <?php if ( $member_default == 'newest' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Newest', 'buddypress' ) ?></option>
                                 <option value="active" <?php if ( $member_default == 'active' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Active', 'buddypress' ) ?></option>
                                 <option value="popular"  <?php if ( $member_default == 'popular' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Popular', 'buddypress' ) ?></option>
-                        </select>                       
+                        </select>
                         </label>
                 </p>
-        
+
         <?php
         }
 }
@@ -183 +183 @@
                         'max_members' => 15
                 );
                 $instance = wp_parse_args( (array) $instance, $defaults );
-                
+
                 $title = strip_tags( $instance['title'] );
                 $max_members = strip_tags( $instance['max_members'] );
                 ?>
@@ -247 +247 @@
                         'max_members' => 15
                 );
                 $instance = wp_parse_args( (array) $instance, $defaults );
-                
+
                 $title = strip_tags( $instance['title'] );
                 $max_members = strip_tags( $instance['max_members'] );
                 ?>
@@ -298 +298 @@
                                                 <?php if ( 'active' == $type ) : ?>
                                                         <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>
                                                 <?php elseif ( 'newest' == $type ) : ?>
-                                                        <div class="item-meta"><span class="activity"><?php bp_member_registered() ?></span></div> 
+                                                        <div class="item-meta"><span class="activity"><?php bp_member_registered() ?></span></div>
                                                 <?php elseif ( bp_is_active( 'friends' ) ) : ?>
                                                         <div class="item-meta"><span class="activity"><?php bp_member_total_friend_count() ?></span></div>
                                                 <?php endif; ?>

bp-core/bp-core-filters.php

@@ -205 +205 @@
         $message = apply_filters( 'bp_core_activation_signup_blog_notification_message', $message, $domain, $path, $title, $user, $user_email, $key, $meta );
 
         wp_mail( $to, $subject, $message, $message_headers );
-        
+
         do_action( 'bp_core_sent_blog_signup_email', $admin_email, $subject, $message, $domain, $path, $title, $user, $user_email, $key, $meta );
 
         // Return false to stop the original WPMU function from continuing

bp-core/admin/bp-core-upgrade.php

@@ -9 +9 @@
 
 // Install site options on activation
 bp_core_activate_site_options( array( 'bp-disable-account-deletion' => 0, 'bp-disable-avatar-uploads' => 0, 'bp-disable-blogforum-comments' => 0,  'bp-disable-forum-directory' => 0,  'bp-disable-profile-sync' => 0 ) );
- 
+
 /**
  * bp_core_activate_site_options()
  *
@@ -55 +55 @@
                 if ( !$this->current_version = get_site_option( 'bp-db-version' ) )
                         if ( $this->current_version = get_option( 'bp-db-version' ) )
                                 $this->is_network_activate = true;
-                
+
                 $this->new_version = constant( 'BP_DB_VERSION' );
                 $this->setup_type = ( empty( $this->current_version ) && !(int)get_site_option( 'bp-core-db-version' ) ) ? 'new' : 'upgrade';
                 $this->current_step = $this->current_step();
@@ -103 +103 @@
                         }
                 } else {
                         // Upgrade wizard steps
-                        
+
                         if ( $this->is_network_activate )
                                 $steps[] = __( 'Multisite Upgrade', 'buddypress' );
-                        
+
                         if ( $this->current_version < $this->new_version )
                                 $steps[] = __( 'Database Upgrade', 'buddypress' );
 
@@ -242 +242 @@
                 </div>
         <?php
         }
-        
+
         function step_ms_upgrade() {
                 if ( !current_user_can( 'activate_plugins' ) )
                         return false;
@@ -251 +251 @@
                         $blogs_slug = constant( 'BP_BLOGS_SLUG' );
                 else
                         $blogs_slug = __( 'blogs', 'buddypress' );
-                
+
                 if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
                         $existing_pages = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
                 else
@@ -261 +261 @@
                 <div class="prev-next submit clear">
                         <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
                 </div>
-                
+
                 <p><?php printf( __( 'It looks like you have just activated WordPress Multisite mode, which allows members of your BuddyPress community to have their own WordPress blogs. You can enable or disable this feature at any time at <a href="%s">Network Options</a>.', 'buddypress' ), admin_url( 'ms-options.php' ) ); ?></p>
-                
+
                 <p><?php _e( "Please select the WordPress page you would like to use to display the blog directory. You can either choose an existing page or let BuddyPress auto-create a page for you. If you'd like to manually create pages, please go ahead and do that now, you can come back to this step once you are finished.", 'buddypress' ) ?></p>
 
                 <p><strong><?php _e( 'Please Note:', 'buddypress' ) ?></strong> <?php _e( "If you have manually added BuddyPress navigation links in your theme you may need to remove these from your header.php to avoid duplicate links.", 'buddypress' ) ?></p>
@@ -280 +280 @@
                                         <p><input type="radio" name="bp_pages[blogs]" checked="checked" value="<?php echo $blogs_slug ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ) ?> <?php echo site_url( $blogs_slug ) ?>/</p>
                                 </td>
                         </tr>
-                        
+
                 </table>
-                
+
                 <p><?php _e( 'Would you like to enable blog tracking, which tracks blog activity across your network?', 'buddypress' ); ?></p>
-                
+
                 <div class="left-col">
-                        
+
                         <div class="component">
                                 <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5>
 
@@ -297 +297 @@
 
                                 <img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" />
                                         <p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p>
-                        </div>          
+                        </div>
                 </div>
-                
+
                 <div class="submit clear">
                         <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
 
@@ -307 +307 @@
                         <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step ) ?>" />
                         <?php wp_nonce_field( 'bpwizard_ms_upgrade' ) ?>
                 </div>
-                
+
                 <script type="text/javascript">
                         jQuery('select').click( function() {
                                 jQuery(this).parent().children('input').attr( 'checked', 'checked' );
@@ -837 +837 @@
                                 // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
                                 if ( $current_blog->blog_id != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
                                         switch_to_blog( BP_ROOT_BLOG );
-        
+
                                 $existing_pages = get_option( 'bp-pages' );
 
                                 $bp_pages = $this->setup_pages( (array)$_POST['bp_pages'] );
-                                
+
                                 $bp_pages = array_merge( (array)$existing_pages, (array)$bp_pages );
-        
+
                                 update_option( 'bp-pages', $bp_pages );
 
                                 if ( $current_blog->blog_id != BP_ROOT_BLOG )
                                         restore_current_blog();
-                        
+
                                 unset( $disabled['bp-blogs.php'] );
-                                
+
                                 bp_core_install( $disabled );
                         }
-                        
+
                         update_site_option( 'bp-deactivated-components', $disabled );
 
                         return true;
@@ -1044 +1044 @@
 
                 return false;
         }
-        
+
         function setup_pages( $pages ) {
                 foreach ( $pages as $key => $value ) {
                         if ( 'page' == $value ) {
@@ -1058 +1058 @@
                                 $bp_pages[$key] = wp_insert_post( array( 'post_title' => ucwords( $value ), 'post_status' => 'publish', 'post_type' => 'page' ) );
                         }
                 }
-                
+
                 return $bp_pages;
         }
 

bp-core/admin/bp-core-schema.php

@@ -227 +227 @@
                             KEY can_delete (can_delete),
                             KEY is_required (is_required)
                            ) {$charset_collate};";
-                
+
         $sql[] = "CREATE TABLE {$wpdb->base_prefix}bp_xprofile_data (
                             id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
                             field_id bigint(20) unsigned NOT NULL,

bp-core/bp-core-templatetags.php

@@ -704 +704 @@
 }
         function bp_get_avatar_admin_step() {
                 global $bp;
-                
+
                 if ( isset( $bp->avatar_admin->step ) )
                         $step = $bp->avatar_admin->step;
                 else
@@ -718 +718 @@
 }
         function bp_get_avatar_to_crop() {
                 global $bp;
-                
+
                 if ( isset( $bp->avatar_admin->image->url ) )
                         $url = $bp->avatar_admin->image->url;
                 else
@@ -1023 +1023 @@
         global $bp;
 
         $options = array();
-        
+
         if ( bp_is_active( 'xprofile' ) )
                 $options['members'] = __( 'Members', 'buddypress' );
 
@@ -1530 +1530 @@
                 $path = bp_core_get_site_path();
         else
                 $path = $current_blog->path;
-                
+
         if ( 'page' != get_option( 'show_on_front' ) || !$component || empty( $bp->pages->{$component} ) || $_SERVER['REQUEST_URI'] != $path )
                 return false;
 

bp-core/bp-core-classes.php

@@ -140 +140 @@
 
                 if ( 'alphabetical' == $type )
                         $sql['where_alpha'] = "AND pd.field_id = 1";
-                
+
                 if ( !empty( $exclude ) )
                         $sql['where_exclude'] = "AND u.ID NOT IN ({$exclude})";
 
@@ -259 +259 @@
 
                 $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%'  ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
                 $paged_users_sql = apply_filters( 'bp_core_users_by_letter_sql', $wpdb->prepare( "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE {$status_sql} AND pf.name = %s {$exclude_sql} AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC{$pag_sql}", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter, $pag_sql );
-                
+
                 $total_users = $wpdb->get_var( $total_users_sql );
                 $paged_users = $wpdb->get_results( $paged_users_sql );
 

bp-core/bp-core-settings.php

@@ -23 +23 @@
 
         if ( !is_super_admin() && empty( $bp->site_options['bp-disable-account-deletion'] ) )
                 bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_my_profile() ) );
-        
+
         do_action( 'bp_core_settings_setup_nav' );
 }
 add_action( 'bp_setup_nav', 'bp_core_add_settings_nav' );
@@ -44 +44 @@
                 require_once( WPINC . '/registration.php' );
 
                 // Form has been submitted and nonce checks out, lets do it.
-                
+
                 // Validate the user again for the current password when making a big change
                 if ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password($_POST['pwd'], $current_user->user_pass, $current_user->ID) ) {
- 
+
                         // Make sure changing an email address does not already exist
                         if ( $_POST['email'] != '' ) {
- 
+
                                 // What is missing from the profile page vs signup - lets double check the goodies
                                 $user_email = sanitize_email( wp_specialchars( trim( $_POST['email'] ) ) );
- 
+
                                 if ( !is_email( $user_email ) )
                                         $email_error = true;
- 
+
                                 $limited_email_domains = get_site_option( 'limited_email_domains', 'buddypress' );
- 
+
                                 if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
                                         $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
- 
+
                                         if ( in_array( $emaildomain, (array)$limited_email_domains ) == false ) {
                                                 $email_error = true;
-                                                
+
                                         }
                                 }
- 
+
                                 if ( !$email_error && $current_user->user_email != $user_email  ) {
-                                
+
                                         //we don't want email dups in the system
                                         if ( email_exists( $user_email ) )
                                                 $email_error = true;
-                                                
+
                                         if (!$email_error)
                                                 $current_user->user_email = $user_email;
                                 }
                         }
- 
+
                         if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
-                        
+
                                 if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) )
                                         $current_user->user_pass = $_POST['pass1'];
                                 else
                                         $pass_error = true;
-  
+
                         } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
                                 $pass_error = true;
                         } else {
                                 unset( $current_user->user_pass );
                         }
- 
+
                         if ( !$email_error && !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
                                 $bp_settings_updated = true;
-                        
+
                 } else {
                         $pwd_error = true;
                 }
-                
+
                 do_action( 'bp_core_general_settings_after_save' );
         }
 
@@ -126 +126 @@
                         <p><?php _e( 'Your passwords did not match', 'buddypress' ) ?></p>
                 </div>
         <?php } ?>
-        
+
         <?php if ( $pwd_error && !$bp_settings_updated ) { ?>
                 <div id="message" class="error fade">
                         <p><?php _e( 'Your password is incorrect', 'buddypress' ) ?></p>
                 </div>
         <?php } ?>
 
-        <?php 
+        <?php
         if ( $email_error && !$bp_settings_updated ) { ?>
                 <div id="message" class="error fade">
                         <p><?php _e( 'Sorry, that email address is already used or is invalid', 'buddypress' ) ?></p>
@@ -152 +152 @@
                 <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label>
                 <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?><br />
                 <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
-                
+
                 <?php do_action( 'bp_core_general_settings_before_submit' ) ?>
 
                 <div class="submit">
                         <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto" />
                 </div>
-                
+
                 <?php do_action( 'bp_core_general_settings_after_submit' ) ?>
 
                 <?php wp_nonce_field('bp_settings_general') ?>
@@ -183 +183 @@
                 }
 
                 $bp_settings_updated = true;
-                
+
                 do_action( 'bp_core_notification_settings_after_save' );
         }
 
@@ -216 +216 @@
                 </div>
 
                 <?php do_action( 'bp_core_notification_settings_after_submit' ) ?>
-                
+
                 <?php wp_nonce_field('bp_settings_notifications') ?>
 
         </form>
@@ -256 +256 @@
                 <input type="checkbox" name="delete-account-understand" id="delete-account-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-account-button').disabled = ''; } else { document.getElementById('delete-account-button').disabled = 'disabled'; }" /> <?php _e( 'I understand the consequences of deleting my account.', 'buddypress' ); ?>
 
                 <?php do_action( 'bp_core_delete_account_before_submit' ) ?>
-                
+
                 <div class="submit">
                         <input type="submit" disabled="disabled" value="<?php _e( 'Delete My Account', 'buddypress' ) ?> &rarr;" id="delete-account-button" name="delete-account-button" />
                 </div>
-                
+
                 <?php do_action( 'bp_core_delete_account_after_submit' ) ?>
 
                 <?php wp_nonce_field('delete-account') ?>

bp-core/bp-core-avatars.php

@@ -484 +484 @@
  */
 function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt ) {
         global $pagenow;
-        
+
         // Do not filter if inside WordPress options page
         if ( 'options-discussion.php' == $pagenow )
                 return $avatar;
-        
+
         // If passed an object, assume $user->user_id
         if ( is_object( $user ) )
                 $id = $user->user_id;

bp-core/bp-core-catchuri.php

@@ -65 +65 @@
 
         // Running off blog other than root
         if ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) {
- 
+
                 // Any subdirectory names must be removed from $bp_uri.
                 // This includes two cases: (1) when WP is installed in a subdirectory,
                 // and (2) when BP is running on secondary blog of a subdirectory
@@ -73 +73 @@
                 if ( $chunks = explode( '/', $current_blog->path ) ) {
                         foreach( $chunks as $key => $chunk ) {
                                 $bkey = array_search( $chunk, $bp_uri );
- 
+
                                 if ( $bkey !== false )
                                         unset( $bp_uri[$bkey] );
- 
+
                                 $bp_uri = array_values( $bp_uri );
                         }
                 }
@@ -139 +139 @@
 
                 unset( $uri_chunks );
         }
-        
+
         // Search doesn't have an associated page, so we check for it separately
         if ( !empty( $bp_uri[0] ) && BP_SEARCH_SLUG == $bp_uri[0] )
                 $matches[] = 1;
-                
+
         // This is not a BuddyPress page, so just return.
         if ( !isset( $matches ) )
                 return false;

bp-friends/bp-friends-notifications.php

@@ -39 +39 @@
         $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link );
 
         wp_mail( $to, $subject, $message );
-        
+
         do_action( 'bp_friends_sent_request_email', $friend_id, $subject, $message, $friendship_id, $initiator_id );
 }
 
@@ -79 +79 @@
         $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link );
 
         wp_mail( $to, $subject, $message );
-        
+
         do_action( 'bp_friends_sent_accepted_email', $initator_id, $subject, $message, $friendship_id, $friend_id );
 }
 

bp-activity/bp-activity-filters.php

@@ -109 +109 @@
  * Finds and links @-mentioned users in activity updates
  *
  * @package BuddyPress Activity
- * 
+ *
  * @param string $content The activity content
  */
 function bp_activity_at_name_filter( $content ) {

bp-activity/bp-activity-notifications.php

@@ -14 +14 @@
         foreach( (array)$usernames as $username ) {
                 if ( !$receiver_user_id = bp_core_get_userid( $username ) )
                         continue;
-                        
-                bp_core_add_notification( $activity_id, $receiver_user_id, 'activity', 'new_at_mention', $poster_user_id ); 
 
+                bp_core_add_notification( $activity_id, $receiver_user_id, 'activity', 'new_at_mention', $poster_user_id );
+
                 // Now email the user with the contents of the message (if they have enabled email notifications)
                 if ( 'no' != get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
                         $poster_name = bp_core_get_user_displayname( $poster_user_id );
@@ -53 +53 @@
                         wp_mail( $to, $subject, $message );
                 }
         }
-        
+
         do_action( 'bp_activity_sent_mention_email', $usernames, $subject, $message, $content, $poster_user_id, $activity_id );
 }
 add_action( 'bp_activity_posted_update', 'bp_activity_at_message_notification', 10, 3 );
@@ -97 +97 @@
                 $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link );
 
                 wp_mail( $to, $subject, $message );
-                
+
                 do_action( 'bp_activity_sent_reply_to_update_email', $original_activity->user_id, $subject, $message, $comment_id, $commenter_id, $params );
         }
 
@@ -142 +142 @@
                 $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message, $poster_name, $content );
 
                 wp_mail( $to, $subject, $message );
-                
+
                 do_action( 'bp_activity_sent_reply_to_reply_email', $original_activity->user_id, $subject, $message, $comment_id, $commenter_id, $params );
         }
 }

bp-activity/bp-activity-templatetags.php

@@ -135 +135 @@
 /**
  * bp_has_activities()
  *
- * Initializes the activity loop. 
+ * Initializes the activity loop.
  *
  * Based on the $args passed, bp_has_activities() populates the $activities_template global.
  *
@@ -173 +173 @@
                 if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
                         $show_hidden = true;
         }
-        
+
         // The default scope should recognize custom slugs
         if ( array_key_exists( $bp->current_action, (array)$bp->active_components ) ) {
                 $scope = $bp->active_components[$bp->current_action];
@@ -941 +941 @@
         return apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment );
 }
 
-function bp_activity_can_favorite() {   
+function bp_activity_can_favorite() {
         $can_favorite = true;
-        
+
         return apply_filters( 'bp_activity_can_favorite', $can_favorite );
 }
 
@@ -1030 +1030 @@
 function bp_member_activity_feed_link() {
         echo bp_get_member_activity_feed_link();
 }
-function bp_activities_member_rss_link() { 
-        echo bp_get_member_activity_feed_link(); 
+function bp_activities_member_rss_link() {
+        echo bp_get_member_activity_feed_link();
 }
 
         function bp_get_member_activity_feed_link() {

bp-activity/bp-activity-classes.php

@@ -120 +120 @@
                 // Exclude specified items
                 if ( $exclude )
                         $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";
-                
+
                 // The specific ids to which you want to limit the query
                 if ( !empty( $in ) ) {
                         if ( is_array( $in ) )
@@ -461 +461 @@
 
                 // array of prepared integers or quoted strings
                 $items_prepared = array();
-                
+
                 // clean up and format each item
                 foreach ( $items_dirty as $item ) {
                         // clean up the string

bp-loader.php

@@ -112 +112 @@
                 'registration',
                 'fileupload_maxk'
         ) );
-        
+
         // These options always come from the options table of BP_ROOT_BLOG
         $root_blog_options = apply_filters( 'bp_core_root_blog_options', array(
                 'avatar_default'
@@ -124 +124 @@
                 $site_meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys}) AND site_id = {$wpdb->siteid}" );
         else
                 $site_meta = $wpdb->get_results( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ({$meta_keys})" );
-                
+
         $root_blog_meta_keys = "'" . implode( "','", (array)$root_blog_options ) ."'";
-        
+
         $root_blog_meta_table = $wpdb->get_blog_prefix( BP_ROOT_BLOG ) . 'options';
         $root_blog_meta = $wpdb->get_results( $wpdb->prepare( "SELECT option_name AS name, option_value AS value FROM {$root_blog_meta_table} WHERE option_name IN ({$root_blog_meta_keys})" ) );
 

bp-blogs.php

@@ -475 +475 @@
 
         if ( empty( $role ) ) {
                 $key = $wpdb->get_blog_prefix( $id ). 'capabilities';
-                
+
                 $roles = get_user_meta( $user_id, $key, true );
-                
+
                 if ( is_array( $roles ) )
                         $role = array_search( 1, $roles );
                 else

bp-forums.php

@@ -72 +72 @@
                                                 $error_message = __( 'Please provide a title for your forum topic.', 'buddypress' );
                                         else if ( empty( $_POST['topic_text'] ) )
                                                 $error_message = __( 'Forum posts cannot be empty. Please enter some text.', 'buddypress' );
-                                        
+
                                         if ( $error_message ) {
                                                 bp_core_add_message( $error_message, 'error' );
                                                 $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum';
@@ -85 +85 @@
                                                         $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
                                                 }
                                         }
-                                        
+
                                         bp_core_redirect( $redirect );
-                                
+
                                 } else {
                                         bp_core_add_message( __( 'Please pick the group forum where you would like to post this topic.', 'buddypress' ), 'error' );
                                 }

bp-groups.php

@@ -495 +495 @@
                                         $error_message = __( 'Please provide a title for your forum topic.', 'buddypress' );
                                 else if ( empty( $_POST['topic_text'] ) )
                                         $error_message = __( 'Forum posts cannot be empty. Please enter some text.', 'buddypress' );
-                                
+
                                 if ( isset( $error_message ) ) {
                                         bp_core_add_message( $error_message, 'error' );
                                         $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum';
@@ -1038 +1038 @@
                                 bp_core_add_message( __( 'Please fill in all of the required fields', 'buddypress' ), 'error' );
                                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
                         }
-                        
+
                         $new_group_id = isset( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : 0;
 
                         if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
@@ -1330 +1330 @@
 
 function groups_update_last_activity( $group_id = false ) {
         global $bp;
-        
+
         if ( !$group_id )
                 $group_id = $bp->groups->current_group->id;
-                
+
         if ( !$group_id )
                 return false;
-        
+
         groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() );
 }
 add_action( 'groups_leave_group', 'groups_update_last_activity' );

bp-blogs/bp-blogs-classes.php

@@ -112 +112 @@
                 foreach ( (array)$paged_blogs as $blog ) {
                         $blog_ids[] = $blog->blog_id;
                 }
-                
+
                 $blog_ids = $wpdb->escape( join( ',', (array)$blog_ids ) );
                 $paged_blogs = BP_Blogs_Blog::get_blog_extras( &$paged_blogs, $blog_ids, $type );
 

bp-messages/bp-messages-notifications.php

@@ -43 +43 @@
 
                 wp_mail( $email_to, $email_subject, $email_content );
         }
-        
+
         do_action( 'bp_messages_sent_notification_email', $recipients, $email_subject, $email_content, $args );
 }
 

bp-messages/bp-messages-templatetags.php

@@ -660 +660 @@
 
 function bp_thread_has_messages( $args = '' ) {
         global $bp, $thread_template, $group_id;
-        
+
         $defaults = array(
                 'thread_id' => false,
                 'order' => 'ASC'

bp-messages/js/autocomplete/jquery.autocompletefb.dev.js

@@ -6 +6 @@
  * Credits:
  * - Idea: Facebook
  * - Guillermo Rauch: Original MooTools script
- * - InteRiders <http://interiders.com/> 
+ * - InteRiders <http://interiders.com/>
  *
  * Copyright (c) 2008 Widi Harsojo <wharsojo@gmail.com>, http://wharsojo.wordpress.com/
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  */
- 
-jQuery.fn.autoCompletefb = function(options) 
+
+jQuery.fn.autoCompletefb = function(options)
 {
         var tmp = this;
-        var settings = 
+        var settings =
         {
                 ul         : tmp,
                 urlLookup  : [""],
@@ -25 +25 @@
                 foundClass : ".friend-tab",
                 inputClass : ".send-to-input"
         }
-        
+
         if(options) jQuery.extend(settings, options);
-        
-        var acfb = 
+
+        var acfb =
         {
                 params  : settings,
                 removeFind : function(o){
@@ -42 +42 @@
                         jQuery('#send-to-usernames').removeClass(newID[1]);
                 }
         }
-        
+
         jQuery(settings.foundClass+" img.p").click(function(){
                 acfb.removeFind(this);
         });
-        
+
         jQuery(settings.inputClass,tmp).autocomplete(settings.urlLookup,settings.acOptions);
         jQuery(settings.inputClass,tmp).result(function(e,d,f){
                 var f = settings.foundClass.replace(/\./,'');
@@ -56 +56 @@
                 var l = jQuery(ln).attr('value');
                 var v = '<li class="'+f+'" id="un-'+un+'"><span><a href="'+l+'">'+d[0]+'</a></span> <span class="p">X</span></li>';
                 var x = jQuery(settings.inputClass,tmp).before(v);
-                
+
                 jQuery('#send-to-usernames').addClass(un);
-                
+
                 jQuery('.p',x[0].previousSibling).click(function(){
                         acfb.removeFind(this);
                 });
                 jQuery(settings.inputClass,tmp).val('');
         });
-        
+
         jQuery(settings.inputClass,tmp).focus();
         return acfb;
 }

bp-messages/js/autocomplete/jquery.autocompletefb.js

@@ -6 +6 @@
  * Credits:
  * - Idea: Facebook
  * - Guillermo Rauch: Original MooTools script
- * - InteRiders <http://interiders.com/> 
+ * - InteRiders <http://interiders.com/>
  *
  * Copyright (c) 2008 Widi Harsojo <wharsojo@gmail.com>, http://wharsojo.wordpress.com/
  * Dual licensed under the MIT and GPL licenses:

bp-messages/js/autocomplete/jquery.bgiframe.min.js

@@ -1 +1 @@
 /* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
  * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
  *
  * $LastChangedDate: 2007-07-22 01:45:56 +0200 (Son, 22 Jul 2007) $

bp-messages/js/autocomplete/jquery.dimensions.dev.js

@@ -12 +12 @@
  */
 
 (function($){
-        
+
 $.dimensions = {
         version: '@VERSION'
 };
 
 // Create innerHeight, innerWidth, outerHeight and outerWidth methods
 $.each( [ 'Height', 'Width' ], function(i, name){
-        
+
         // innerHeight and innerWidth
         $.fn[ 'inner' + name ] = function() {
                 if (!this[0]) return;
-                
+
                 var torl = name == 'Height' ? 'Top'    : 'Left',  // top or left
                     borr = name == 'Height' ? 'Bottom' : 'Right'; // bottom or right
-                
+
                 return this[ name.toLowerCase() ]() + num(this, 'padding' + torl) + num(this, 'padding' + borr);
         };
-        
+
         // outerHeight and outerWidth
         $.fn[ 'outer' + name ] = function(options) {
                 if (!this[0]) return;
-                
+
                 var torl = name == 'Height' ? 'Top'    : 'Left',  // top or left
                     borr = name == 'Height' ? 'Bottom' : 'Right'; // bottom or right
-                
+
                 options = $.extend({ margin: false }, options || {});
-                
+
                 return this[ name.toLowerCase() ]()
                                 + num(this, 'border' + torl + 'Width') + num(this, 'border' + borr + 'Width')
                                 + num(this, 'padding' + torl) + num(this, 'padding' + borr)
@@ -50 +50 @@
 $.each( ['Left', 'Top'], function(i, name) {
         $.fn[ 'scroll' + name ] = function(val) {
                 if (!this[0]) return;
-                
+
                 return val != undefined ?
-                
+
                         // Set the scroll offset
                         this.each(function() {
                                 this == window || this == document ?
-                                        window.scrollTo( 
+                                        window.scrollTo(
                                                 name == 'Left' ? val : $(window)[ 'scrollLeft' ](),
                                                 name == 'Top'  ? val : $(window)[ 'scrollTop'  ]()
                                         ) :
                                         this[ 'scroll' + name ] = val;
                         }) :
-                        
+
                         // Return the scroll offset
                         this[0] == window || this[0] == document ?
                                 self[ (name == 'Left' ? 'pageXOffset' : 'pageYOffset') ] ||
@@ -75 +75 @@
 $.fn.extend({
         position: function() {
                 var left = 0, top = 0, elem = this[0], offset, parentOffset, offsetParent, results;
-                
+
                 if (elem) {
                         // Get *real* offsetParent
                         offsetParent = this.offsetParent();
-                        
+
                         // Get correct offsets
                         offset       = this.offset();
                         parentOffset = offsetParent.offset();
-                        
+
                         // Subtract element margins
                         offset.top  -= num(elem, 'marginTop');
                         offset.left -= num(elem, 'marginLeft');
-                        
+
                         // Add offsetParent borders
                         parentOffset.top  += num(offsetParent, 'borderTopWidth');
                         parentOffset.left += num(offsetParent, 'borderLeftWidth');
-                        
+
                         // Subtract the two offsets
                         results = {
                                 top:  offset.top  - parentOffset.top,
                                 left: offset.left - parentOffset.left
                         };
                 }
-                
+
                 return results;
         },
-        
+
         offsetParent: function() {
                 var offsetParent = this[0].offsetParent;
                 while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && $.css(offsetParent, 'position') == 'static') )

bp-forums/bp-forums-filters.php

@@ -8 +8 @@
 add_filter( 'bp_get_the_topic_latest_post_excerpt', 'bp_forums_filter_kses', 1 );
 add_filter( 'bp_get_the_topic_post_content', 'bp_forums_filter_kses', 1 );
 
-add_filter( 'bp_get_the_topic_title', 'force_balance_tags' ); 
+add_filter( 'bp_get_the_topic_title', 'force_balance_tags' );
 add_filter( 'bp_get_the_topic_latest_post_excerpt', 'force_balance_tags' );
 add_filter( 'bp_get_the_topic_post_content', 'force_balance_tags' );
 
@@ -120 +120 @@
  */
 function bp_forums_strip_mentions_on_post_edit( $content ) {
         global $bp;
-        
+
         $content = htmlspecialchars_decode( $content );
-        
+
         $pattern = "|<a href=&#039;" . $bp->root_domain . "/" . $bp->members->slug . "/[A-Za-z0-9-_\.]+/&#039; rel=&#039;nofollow&#039;>(@[A-Za-z0-9-_\.]+)</a>|";
-        
+
         $content = preg_replace( $pattern, "$1", $content );
-        
+
         return $content;
 }
 add_filter( 'bp_get_the_topic_post_edit_text', 'bp_forums_strip_mentions_on_post_edit' );

bp-core.php

@@ -482 +482 @@
                         $wpdb->update( $wpdb->users, array( 'spam' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
 
                 $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
-                
+
                 if ( $is_spam )
                         bp_core_add_message( __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' ) );
                 else
@@ -491 +491 @@
                 /* Hide this user's activity */
                 if ( $is_spam && function_exists( 'bp_activity_hide_user_activity' ) )
                         bp_activity_hide_user_activity( $bp->displayed_user->id );
-                
+
                 // We need a special hook for is_spam so that components can delete data at spam time
                 if ( $is_spam )
                         do_action( 'bp_make_spam_user', $bp->displayed_user->id );
@@ -2000 +2000 @@
  * Functions to set up custom BuddyPress actions that all other components can
  * hook in to.
  */
- 
+
 /**
  * bp_include()
  *

bp-xprofile.php

@@ -633 +633 @@
         if ( is_array( $values ) ) {
                 $data = array();
                 foreach( (array)$values as $value ) {
-                        $data[] = apply_filters( 'xprofile_get_field_data', $value ); 
+                        $data[] = apply_filters( 'xprofile_get_field_data', $value );
                 }
         } else {
                 $data = apply_filters( 'xprofile_get_field_data', $values );
         }
-        
+
         return $data;
 }
 
@@ -927 +927 @@
 
         if ( !$object_id )
                 return false;
-        
+
         if ( !isset( $object_type ) )
                 return false;
-        
+
         if ( !in_array( $object_type, array( 'group', 'field', 'data' ) ) )
                 return false;
 
@@ -961 +961 @@
 
         if ( !$object_id )
                 return false;
-        
+
         if ( !isset( $object_type ) )
                 return false;
-        
+
         if ( !in_array( $object_type, array( 'group', 'field', 'data' ) ) )
                 return false;
 
@@ -1002 +1002 @@
 
         if ( !$object_id )
                 return false;
-        
+
         if ( !isset( $object_type ) )
                 return false;
-        
+
         if ( !in_array( $object_type, array( 'group', 'field', 'data' ) ) )
                 return false;
-                
+
         $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
 
         if ( is_string( $meta_value ) )
@@ -1018 +1018 @@
 
         if ( empty( $meta_value ) )
                 return bp_xprofile_delete_meta( $object_id, $object_type, $meta_key );
-        
+
         $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s", $object_id, $object_type, $meta_key ) );
 
         if ( !$cur )
@@ -1035 +1035 @@
 }
 
 function bp_xprofile_update_fieldgroup_meta( $field_group_id, $meta_key, $meta_value ) {
-        return bp_xprofile_update_meta( $field_group_id, 'group', $meta_key, $meta_value );     
+        return bp_xprofile_update_meta( $field_group_id, 'group', $meta_key, $meta_value );
 }
 
 function bp_xprofile_update_field_meta( $field_id, $meta_key, $meta_value ) {
-        return bp_xprofile_update_meta( $field_id, 'field', $meta_key, $meta_value );   
+        return bp_xprofile_update_meta( $field_id, 'field', $meta_key, $meta_value );
 }
 
 function bp_xprofile_update_fielddata_meta( $field_data_id, $meta_key, $meta_value ) {
-        return bp_xprofile_update_meta( $field_data_id, 'data', $meta_key, $meta_value );       
+        return bp_xprofile_update_meta( $field_data_id, 'data', $meta_key, $meta_value );
 }
 
 /********************************************************************************

bp-groups/bp-groups-classes.php

@@ -288 +288 @@
                         $include = $wpdb->escape( $include );
                         $sql['include'] = " AND g.id IN ({$include})";
                 }
-                
+
                 if ( !empty( $exclude ) ) {
                         $exclude = $wpdb->escape( $exclude );
                         $sql['exclude'] = " AND g.id NOT IN ({$exclude})";
@@ -357 +357 @@
 
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
         }
-        
+
         function get_by_most_forum_topics( $limit = null, $page = null, $user_id = false, $search_terms = false, $populate_extras = true, $exclude = false ) {
                 global $wpdb, $bp, $bbdb;
 
@@ -375 +375 @@
                         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
                         $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
                 }
-                
+
                 if ( !empty( $exclude ) ) {
                         $exclude = $wpdb->escape( $exclude );
                         $exclude_sql = " AND g.id NOT IN ({$exclude})";
@@ -416 +416 @@
                         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
                         $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
                 }
-                
+
                 if ( !empty( $exclude ) ) {
                         $exclude = $wpdb->escape( $exclude );
                         $exclude_sql = " AND g.id NOT IN ({$exclude})";
@@ -493 +493 @@
                         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
                         $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
                 }
-                
+
                 if ( !empty( $exclude ) ) {
                         $exclude = $wpdb->escape( $exclude );
                         $exclude_sql = " AND g.id NOT IN ({$exclude})";
@@ -866 +866 @@
                 global $wpdb, $bp;
 
                 $pag_sql = ( !empty( $limit ) && !empty( $page ) ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
-                
+
                 $exclude_sql = !empty( $exclude ) ? $wpdb->prepare( " AND g.id NOT IN (%s)", $exclude ) : '';
 
                 $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d {$exclude_sql} ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );

bp-groups/bp-groups-widgets.php

@@ -23 +23 @@
 
         function widget( $args, $instance ) {
                 global $bp;
-                
+
                 $user_id = apply_filters( 'bp_group_widget_user_id', '0' );
 
                 extract( $args );
@@ -99 +99 @@
                         'title' => __( 'Groups', 'buddypress' ),
                         'max_members' => 5,
                         'group_default' => 'active'
-                );      
+                );
                 $instance = wp_parse_args( (array) $instance, $defaults );
-                
+
                 $title = strip_tags( $instance['title'] );
                 $max_groups = strip_tags( $instance['max_groups'] );
                 $group_default = strip_tags( $instance['group_default'] );
                 ?>
-                
+
                 <p><label for="bp-groups-widget-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
 
                 <p><label for="bp-groups-widget-groups-max"><?php _e('Max groups to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_groups' ); ?>" name="<?php echo $this->get_field_name( 'max_groups' ); ?>" type="text" value="<?php echo esc_attr( $max_groups ); ?>" style="width: 30%" /></label></p>
-                
+
                 <p>
-                        <label for="bp-groups-widget-groups-default"><?php _e('Default groups to show:', 'buddypress'); ?> 
+                        <label for="bp-groups-widget-groups-default"><?php _e('Default groups to show:', 'buddypress'); ?>
                         <select name="<?php echo $this->get_field_name( 'group_default' ); ?>">
                                 <option value="newest" <?php if ( $group_default == 'newest' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Newest', 'buddypress' ) ?></option>
                                 <option value="active" <?php if ( $group_default == 'active' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Active', 'buddypress' ) ?></option>
                                 <option value="popular"  <?php if ( $group_default == 'popular' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Popular', 'buddypress' ) ?></option>
-                        </select>                       
+                        </select>
                         </label>
                 </p>
         <?php

bp-groups/bp-groups-notifications.php

@@ -38 +38 @@
 
                 unset( $message, $to );
         }
-        
+
         do_action( 'bp_groups_sent_updated_email', $user_ids, $subject, $message, $group_id );
 }
 
@@ -86 +86 @@
         $message = apply_filters( 'groups_notification_new_membership_request_message', $message, &$group, $requesting_user_name, $profile_link, $group_requests );
 
         wp_mail( $to, $subject, $message );
-        
+
         do_action( 'bp_groups_sent_membership_request_email', $admin_id, $subject, $message, $requesting_user_id, $group_id, $membership_id );
 }
 
@@ -142 +142 @@
         $message = apply_filters( 'groups_notification_membership_request_completed_message', $message, &$group, $group_link  );
 
         wp_mail( $to, $subject, $message );
-        
+
         do_action( 'bp_groups_sent_membership_approved_email', $requesting_user_id, $subject, $message, $group_id );
 }
 
@@ -190 +190 @@
         $message = apply_filters( 'groups_notification_promoted_member_message', $message, &$group, $promoted_to, $group_link );
 
         wp_mail( $to, $subject, $message );
-        
+
         do_action( 'bp_groups_sent_promoted_email', $user_id, $subject, $message, $group_id );
 }
 add_action( 'groups_promoted_member', 'groups_notification_promoted_member', 10, 2 );
@@ -245 +245 @@
 
                 wp_mail( $to, $subject, $message );
         }
-        
+
         do_action( 'bp_groups_sent_invited_email', $invited_user_id, $subject, $message, $group );
 }
 
@@ -306 +306 @@
                         wp_mail( $to, $subject, $message );
                 }
         }
-        
+
         do_action( 'bp_groups_sent_mention_email', $usernames, $subject, $message, $content, $poster_user_id, $group_id, $activity_id );
 }
 add_action( 'bp_groups_posted_update', 'groups_at_message_notification', 10, 4 );

bp-groups/bp-groups-templatetags.php

@@ -1715 +1715 @@
 }
         function bp_get_new_group_id() {
                 global $bp;
-                
+
                 if ( isset( $bp->groups->new_group_id ) )
                         $new_group_id = $bp->groups->new_group_id;
                 else
                         $new_group_id = 0;
-                
+
                 return apply_filters( 'bp_get_new_group_id', $new_group_id );
         }
 
@@ -1729 +1729 @@
 }
         function bp_get_new_group_name() {
                 global $bp;
-                
+
                 if ( isset( $bp->groups->current_group->name ) )
                         $name = $bp->groups->current_group->name;
                 else
                         $name = '';
-                
+
                 return apply_filters( 'bp_get_new_group_name', $name );
         }
 
@@ -1743 +1743 @@
 }
         function bp_get_new_group_description() {
                 global $bp;
-                
+
                 if ( isset( $bp->groups->current_group->description ) )
                         $description = $bp->groups->current_group->description;
                 else
                         $description = '';
-                        
+
                 return apply_filters( 'bp_get_new_group_description', $description );
         }
 
@@ -1855 +1855 @@
 
                         for ( $i = 0; $i < count( $friends ); $i++ ) {
                                 $checked = '';
-                                
+
                                 if ( !empty( $invites ) ) {
                                         if ( in_array( $friends[$i]['id'], $invites ) )
                                                 $checked = ' checked="checked"';
@@ -2245 +2245 @@
 
         if ( !$group_id ) {
                 /* Backwards compatibility */
-                if ( !empty( $bp->groups->current_group ) ) 
+                if ( !empty( $bp->groups->current_group ) )
                         $group_id = $bp->groups->current_group->id;
                 if ( !empty( $bp->groups->new_group_id ) )
                         $group_id = $bp->groups->new_group_id;