Changeset 371

Timestamp:

10/02/2008 05:47:14 AM (18 years ago)

Author:

apeatling

Message:

Fixed missing user ID on blog post deletion.

Location:

trunk

Files:

• bp-blogs.php (modified) (4 diffs)
• bp-blogs/bp-blogs-classes.php (modified) (1 diff)
• bp-core.php (modified) (1 diff)

trunk/bp-blogs.php

@@ -250 +250 @@
         global $bp;
         
+        if ( !$bp ) {
+                bp_core_setup_globals();
+                bp_blogs_setup_globals();
+        }
+        
         if ( !$user_id )
                 $user_id = $bp['loggedin_userid'];
@@ -270 +275 @@
 function bp_blogs_record_post($post_id = '') {
         global $bp, $current_blog;
+        
+        if ( !$bp ) {
+                bp_core_setup_globals();
+                bp_blogs_setup_globals();
+        }
         
         $post_id = (int)$post_id;
@@ -398 +408 @@
 
 function bp_blogs_remove_post( $post_id = '' ) {
-        global $current_blog;
+        global $current_blog, $bp;
+        
+        if ( !$bp ) {
+                bp_core_setup_globals();
+                bp_blogs_setup_globals();
+        }
         
         $post_id = (int)$post_id;
         $blog_id = (int)$current_blog->blog_id;
 
-        BP_Blogs_Post::delete( $post_id, $blog_id );
+        BP_Blogs_Post::delete( $post_id, $blog_id, $bp['loggedin_userid'] );
 }
 add_action( 'delete_post', 'bp_blogs_remove_post' );
 
 function bp_blogs_remove_comment( $comment_id = '' ) {
-        global $current_blog;
+        global $current_blog, $bp;
+        
+        if ( !$bp ) {
+                bp_core_setup_globals();
+                bp_blogs_setup_globals();
+        }
         
         $comment_id = (int)$comment_id;
         $blog_id = (int)$current_blog->blog_id;
         
-        BP_Blogs_Comment::delete( $comment_id, $blog_id );      
+        BP_Blogs_Comment::delete( $comment_id, $blog_id, $bp['loggedin_userid'] );      
 }
 add_action( 'delete_comment', 'bp_blogs_remove_comment' );
@@ -437 +457 @@
         global $wpdb, $bp;
         
+        if ( !$bp ) {
+                bp_core_setup_globals();
+                bp_blogs_setup_globals();
+        }       
+        
         $user_id = $bp['loggedin_userid'];
         $blogs = get_blogs_of_user($user_id);

trunk/bp-blogs/bp-blogs-classes.php

@@ -151 +151 @@
         
         function delete( $post_id, $blog_id, $user_id = null ) {
-                global $wpdb, $bp;
-                
-                if ( !$user_id )
-                        $user_id = $bp['loggedin_userid'];
+                global $wpdb, $bp, $current_user;
+                
+                if ( !$user_id )
+                        $user_id = $current_user->ID;
 
                 return $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp['blogs']['table_name_blog_posts'] . " WHERE user_id = %d AND blog_id = %d AND post_id = %d", $user_id, $blog_id, $post_id ) );

trunk/bp-core.php

@@ -222 +222 @@
         /* Check to see if this is a user home, and if it is, get the user id */
         if ( !$current_userid = bp_core_get_homebase_userid( $blog_id ) )
-                return false; // return 0 if this is a normal blog, and not a user home.
+                return false; // return false if this is a normal blog, and not a user home.
         
         return $current_userid;