Ticket #2621: patch-2621.patch

bp-themes/bp-default/comments.php

@@ -95 +95 @@
 
                                         <?php do_action( 'bp_before_blog_comment_form' ) ?>
 
-                                        <form action="<?php echo get_option( 'siteurl' ); ?>/wp-comments-post.php" method="post" id="commentform" class="standard-form">
+                                        <form action="<?php echo site_url( 'wp-comments-post.php' ) ?>" method="post" id="commentform" class="standard-form">
 
                                                 <?php if ( $user_ID ) : ?>
 

bp-blogs.php

@@ -320 +320 @@
         }
 }
 
+/**
+ * Makes BuddyPress aware of a new site so that it can track its activity.
+ *
+ * @global object $bp BuddyPress global settings
+ * @param int $blog_id
+ * @param int $user_id
+ * @param $bool $no_activity ; optional.
+ * @since 1.0
+ * @uses BP_Blogs_Blog
+ */
 function bp_blogs_record_blog( $blog_id, $user_id, $no_activity = false ) {
         global $bp;
 
@@ -347 +357 @@
                 /* Record this in activity streams */
                 bp_blogs_record_activity( array(
                         'user_id' => $recorded_blog->user_id,
-                        'action' => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . esc_attr( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
-                        'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_blog_option( $recorded_blog->blog_id, 'siteurl' ), $recorded_blog->blog_id ),
+                        'action' => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_site_url( $recorded_blog->blog_id ) . '">' . esc_attr( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
+                        'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_site_url( $recorded_blog->blog_id ), $recorded_blog->blog_id ),
                         'type' => 'new_blog',
                         'item_id' => $recorded_blog->blog_id
                 ) );
@@ -649 +659 @@
         if ( $bp->current_component == $bp->blogs->slug && isset( $_GET['random-blog'] ) ) {
                 $blog = bp_blogs_get_random_blogs( 1, 1 );
 
-                bp_core_redirect( get_blog_option( $blog['blogs'][0]->blog_id, 'siteurl') );
+                bp_core_redirect( get_site_url( $blog['blogs'][0]->blog_id ) );
         }
 }
 add_action( 'wp', 'bp_blogs_redirect_to_random_blog', 6 );