Changeset 2120

Timestamp:

11/25/2009 10:32:06 AM (16 years ago)

Author:

apeatling

Message:

Merging 1.1 branch r2113 through r2119 into trunk.

Location:

trunk

Files:

• bp-blogs.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (3 diffs)
• bp-friends.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (3 diffs)
• bp-groups/bp-groups-notifications.php (modified) (1 diff)

trunk/bp-blogs.php

@@ -449 +449 @@
         return false;
 
+    /* If this is a password protected post, don't record the comment */
+    if ( !empty( $post->post_password ) )
+        return false;
+
     $recorded_comment = new BP_Blogs_Comment;
     $recorded_comment->user_id = $user_id;

trunk/bp-core/bp-core-avatars.php

@@ -78 +78 @@
     }
 
-    if ( !$css_id )
-        $css_id = $object . '-' . $item_id . '-avatar';
+    /* Add an identifying class to each item */
+    $class .= ' ' . $object . '-' . $item_id . '-avatar';
+
+    if ( !empty($css_id) )
+        $css_id = " id='{$css_id}'";
 
     if ( $width )
@@ -113 +116 @@
 
         if ( $avatar_url )
-            return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
+            return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );
     }
 
@@ -138 +141 @@
         $gravatar = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $grav_email ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
 
-        return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
+        return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );
 
     } else {

trunk/bp-friends.php

@@ -118 +118 @@
     if ( isset($bp->action_variables) && 'accept' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
         /* Check the nonce */
-        if ( !check_admin_referer( 'friends_accept_friendship' ) )
-            return false;
+        check_admin_referer( 'friends_accept_friendship' );
 
         if ( friends_accept_friendship( $bp->action_variables[1] ) ) {
@@ -130 +129 @@
     } else if ( isset($bp->action_variables) && 'reject' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
         /* Check the nonce */
-        if ( !check_admin_referer( 'friends_reject_friendship' ) )
-            return false;
+        check_admin_referer( 'friends_reject_friendship' );
+
 
         if ( friends_reject_friendship( $bp->action_variables[1] ) ) {
@@ -630 +629 @@
         $friend_link = bp_core_get_userlink( $friendship->friend_user_id );
 
-        $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_userlink( $friendship->initiator_user_id ), &$friendship );
+        $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_userurl( $friendship->initiator_user_id ), &$friendship );
 
         /* Record in activity streams for the initiator */

trunk/bp-groups/bp-groups-classes.php

@@ -422 +422 @@
         global $wpdb, $bp;
 
+        // Default sql WHERE conditions are blank. TODO: generic handler function.
+        $where_sql = null;
+        $where_conditions = array();
+
+        // Limit results to public status
         if ( $only_public )
-            $public_sql = $wpdb->prepare( " AND g.status = 'public'" );
+            $where_conditions[] = $wpdb->prepare( "g.status = 'public'" );
 
         if ( !is_site_admin() )
-            $hidden_sql = $wpdb->prepare( " AND g.status != 'hidden'");
+            $where_conditions[] = $wpdb->prepare( "g.status != 'hidden'");
+
+        // Build where sql statement if necessary
+        if ( !empty( $where_conditions ) )
+            $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
 
         if ( $limit && $page )
@@ -438 +447 @@
             switch ( $sort_by ) {
                 default:
-                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g WHERE 1=1 {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
+                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
                     break;
                 case 'members':
@@ -448 +457 @@
             }
         } else {
-            $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
+            $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
         }
 

trunk/bp-groups/bp-groups-notifications.php

@@ -239 +239 @@
         $settings_link = bp_core_get_user_domain( $invited_user_id ) . 'settings/notifications/';
         $invited_link = bp_core_get_user_domain( $invited_user_id );
-        $invites_link = $invited_link . '/' . $bp->groups->slug . '/invites';
+        $invites_link = $invited_link . $bp->groups->slug . '/invites';
 
         // Set up and send the message