Ticket #6997: 6997-bp-blogs-template.patch

src/bp-blogs/bp-blogs-template.php

@@ -631 +631 @@
                  * Filters the HTML markup result for the latest blog post in loop.
                  *
                  * @since 1.2.0
+                 * @since 2.6.0 Added the `$r` parameter.
                  *
                  * @param string $retval HTML markup for the latest post.
+                 * @param array  $r      Array of parsed arguments.
                  */
-                return apply_filters( 'bp_get_blog_latest_post', $retval );
+                return apply_filters( 'bp_get_blog_latest_post', $retval, $r );
         }
 
 /**
@@ -876 +878 @@
                  * Filters the total number of blogs for a given user.
                  *
                  * @since 1.2.0
+                 * @since 2.6.0 Added the `$user_id` parameter.
                  *
-                 * @param int $value Total number of blogs for a given user.
+                 * @param int $value   Total number of blogs for a given user.
+                 * @param int $user_id ID of the queried user.
                  */
-                return apply_filters( 'bp_get_total_blog_count_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
+                return apply_filters( 'bp_get_total_blog_count_for_user', bp_blogs_total_blogs_for_user( $user_id ), $user_id );
         }
         add_filter( 'bp_get_total_blog_count_for_user', 'bp_core_number_format' );
 
@@ -926 +930 @@
  * @param string|WP_Error $errors     Optional. The WP_Error object returned by a previous
  *                                    submission attempt.
  */
-function bp_show_blog_signup_form($blogname = '', $blog_title = '', $errors = '') {
+function bp_show_blog_signup_form( $blogname = '', $blog_title = '', $errors = '' ) {
         global $current_user;
 
         if ( isset($_POST['submit']) ) {
@@ -947 +951 @@
                  *      WP_Error $errors     WP_Error object.
                  * }
                  */
-                $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
+                $filtered_results = apply_filters( 'signup_another_blog_init', array( 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ) );
                 $blogname = $filtered_results['blogname'];
                 $blog_title = $filtered_results['blog_title'];
                 $errors = $filtered_results['errors'];
 
                 if ( $errors->get_error_code() ) {
-                        echo "<p>" . __('There was a problem; please correct the form below and try again.', 'buddypress') . "</p>";
+                        echo "<p>" . __( 'There was a problem; please correct the form below and try again.', 'buddypress' ) . "</p>";
                 }
                 ?>
-                <p><?php printf(__("By filling out the form below, you can <strong>add a site to your account</strong>. There is no limit to the number of sites that you can have, so create to your heart's content, but blog responsibly!", 'buddypress'), $current_user->display_name) ?></p>
+                <p><?php printf( __( "By filling out the form below, you can <strong>add a site to your account</strong>. There is no limit to the number of sites that you can have, so create to your heart's content, but blog responsibly!", 'buddypress' ), $current_user->display_name ); ?></p>
 
-                <p><?php _e("If you&#8217;re not going to use a great domain, leave it for a new user. Now have at it!", 'buddypress') ?></p>
+                <p><?php _e( "If you&#8217;re not going to use a great domain, leave it for a new user. Now have at it!", 'buddypress' ); ?></p>
 
                 <form class="standard-form" id="setupform" method="post" action="">
 
@@ -972 +976 @@
                          */
                         do_action( 'signup_hidden_fields' ); ?>
 
-                        <?php bp_blogs_signup_blog($blogname, $blog_title, $errors); ?>
+                        <?php bp_blogs_signup_blog( $blogname, $blog_title, $errors ); ?>
                         <p>
-                                <input id="submit" type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Site', 'buddypress') ?>" />
+                                <input id="submit" type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site', 'buddypress' ); ?>" />
                         </p>
 
-                        <?php wp_nonce_field( 'bp_blog_signup_form' ) ?>
+                        <?php wp_nonce_field( 'bp_blog_signup_form' ); ?>
                 </form>
                 <?php
         }
@@ -995 +999 @@
         global $current_site;
 
         // Blog name.
-        if( !is_subdomain_install() )
-                echo '<label for="blogname">' . __('Site Name:', 'buddypress') . '</label>';
+        if ( ! is_subdomain_install() )
+                echo '<label for="blogname">' . __( 'Site Name:', 'buddypress' ) . '</label>';
         else
-                echo '<label for="blogname">' . __('Site Domain:', 'buddypress') . '</label>';
+                echo '<label for="blogname">' . __( 'Site Domain:', 'buddypress' ) . '</label>';
 
-        if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
+        if ( $errmsg = $errors->get_error_message( 'blogname') ) { ?>
 
                 <p class="error"><?php echo $errmsg ?></p>
 
         <?php }
 
-        if ( !is_subdomain_install() )
+        if ( ! is_subdomain_install() )
                 echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span> <input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="63" /><br />';
         else
                 echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="63" ' . bp_get_form_field_attributes( 'blogname' ) . '/> <span class="suffix_address">.' . bp_blogs_get_subdomain_base() . '</span><br />';
 
-        if ( !is_user_logged_in() ) {
-                print '(<strong>' . __( 'Your address will be ' , 'buddypress');
+        if ( ! is_user_logged_in() ) {
+                print '(<strong>' . __( 'Your address will be ' , 'buddypress' );
 
-                if ( !is_subdomain_install() ) {
-                        print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
+                if ( ! is_subdomain_install() ) {
+                        print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress' );
                 } else {
-                        print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path;
+                        print __( 'domain.' , 'buddypress' ) . $current_site->domain . $current_site->path;
                 }
 
-                echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>';
+                echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress' ) . '</p>';
         }
 
         // Blog Title.
         ?>
 
-        <label for="blog_title"><?php _e('Site Title:', 'buddypress') ?></label>
+        <label for="blog_title"><?php _e( 'Site Title:', 'buddypress' ); ?></label>
 
-        <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
+        <?php if ( $errmsg = $errors->get_error_message( 'blog_title' ) ) { ?>
 
-                <p class="error"><?php echo $errmsg ?></p>
+                <p class="error"><?php echo $errmsg; ?></p>
 
         <?php }
-        echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_html($blog_title, 1).'" /></p>';
+        echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_html( $blog_title, 1 ) . '" /></p>';
         ?>
 
         <p>
-                <label for="blog_public_on"><?php _e('Privacy:', 'buddypress') ?></label>
+                <label for="blog_public_on"><?php _e( 'Privacy:', 'buddypress' ); ?></label>
                 <?php _e( 'I would like my site to appear in search engines, and in public listings around this network.', 'buddypress' ); ?>
 
                 <label class="checkbox" for="blog_public_on">
-                        <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
-                        <strong><?php _e( 'Yes' , 'buddypress'); ?></strong>
+                        <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
+                        <strong><?php _e( 'Yes' , 'buddypress' ); ?></strong>
                 </label>
                 <label class="checkbox" for="blog_public_off">
-                        <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
-                        <strong><?php _e( 'No' , 'buddypress'); ?></strong>
+                        <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if ( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
+                        <strong><?php _e( 'No' , 'buddypress' ); ?></strong>
                 </label>
         </p>
 
@@ -1059 +1063 @@
          *
          * @param WP_Error $errors WP_Error object if any present.
          */
-        do_action('signup_blogform', $errors);
+        do_action( 'signup_blogform', $errors );
 }
 
 /**
@@ -1072 +1076 @@
 function bp_blogs_validate_blog_signup() {
         global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path, $current_site;
 
-        if ( !check_admin_referer( 'bp_blog_signup_form' ) )
+        if ( ! check_admin_referer( 'bp_blog_signup_form' ) )
                 return false;
 
         $current_user = wp_get_current_user();
 
-        if( !is_user_logged_in() )
+        if ( ! is_user_logged_in() )
                 die();
 
         $result = bp_blogs_validate_blog_form();
@@ -1127 +1131 @@
         if ( is_user_logged_in() )
                 $user = wp_get_current_user();
 
-        return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
+        return wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'], $user );
 }
 
 /**
@@ -1150 +1154 @@
         restore_current_blog();
 
         ?>
-        <p><?php _e( 'Congratulations! You have successfully registered a new site.', 'buddypress' ) ?></p>
+        <p><?php _e( 'Congratulations! You have successfully registered a new site.', 'buddypress' ); ?></p>
         <p>
                 <?php printf(
                         '%s %s',
@@ -1174 +1178 @@
          *
          * @since 1.0.0
          */
-        do_action('signup_finished');
+        do_action( 'signup_finished' );
 }
 
 /**