Index: src/wp-signup.php =================================================================== --- src/wp-signup.php (revision 25618) +++ src/wp-signup.php (working copy) @@ -18,6 +18,11 @@ * @since MU */ function do_signup_header() { + /** + * Fires within the section of the signup screen. + * + * @since 3.0.0 + */ do_action( 'signup_header' ); } add_action( 'wp_head', 'do_signup_header' ); @@ -63,6 +68,11 @@ add_action( 'wp_head', 'wpmu_signup_stylesheet' ); get_header(); +/** + * Fires before the signup form. + * + * @since 3.0.0 + */ do_action( 'before_signup_form' ); ?>
@@ -128,7 +138,12 @@
get_error_message('generic') ) { echo '

' . $errmsg . '

'; } + /** + * Add extra fields to the user registration form. + * + * @since 3.0.0 + */ do_action( 'signup_extra_fields', $errors ); } @@ -209,8 +229,20 @@ $errors = new WP_Error(); } - // allow definition of default variables - $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors )); + $signup_defaults = array( + 'blogname' => $blogname, + 'blog_title' => $blog_title, + 'errors' => $errors + ); + + /** + * Filter the default site signup variables. + * + * @since 3.0.0 + * + * @param array $signup_defaults An array of default site signup variables. + */ + $filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults ); $blogname = $filtered_results['blogname']; $blog_title = $filtered_results['blog_title']; $errors = $filtered_results['errors']; @@ -241,11 +273,11 @@ 1, 'public' => $public ) ); // deprecated + + $blog_meta_defaults = array( + 'lang_id' => 1, + 'public' => $public + ); + + /** + * Filter the new blog meta variables. + * + * @since 3.0.0 + * @deprecated 3.0.0 + * + * @param array $blog_meta_defaults An array of default blog meta variables. + */ + $meta = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults ); + /** + * Filter the new default site meta variables. + * + * @since 3.0.0 + * + * @param array $meta An array of default site meta variables. + */ $meta = apply_filters( 'add_signup_meta', $meta ); wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid ); @@ -307,6 +360,11 @@ http://%2$s is your new site. Log in as “%4$s” using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>

$user_name, 'user_email' => $user_email, 'errors' => $errors )); + $signup_user_default = array( + 'user_name' => $user_name, + 'user_email' => $user_email, + 'errors' => $errors, + ); + + /** + * Filter the default user variables. + * + * @since 3.0.0 + * + * @param array $signup_user_default An array of default user variables. + */ + $filtered_results = apply_filters( 'signup_user_init', $signup_user_default ); $user_name = $filtered_results['user_name']; $user_email = $filtered_results['user_email']; $errors = $filtered_results['errors']; @@ -389,8 +459,13 @@ return false; } - wpmu_signup_user($user_name, $user_email, apply_filters( 'add_signup_meta', array() ) ); + $optional_signup_meta = array(); + //duplicate_hook + $meta = apply_filters( 'add_signup_meta', $optional_signup_meta ); + + wpmu_signup_user( $user_name, $user_email, $meta ); + confirm_user_signup($user_name, $user_email); return true; } @@ -410,6 +485,7 @@

%s and click the link given.' ), $user_email ); ?>

$user_name, 'user_email' => $user_email, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors )); + $signup_blog_default = array( + 'user_name' => $user_name, + 'user_email' => $user_email, + 'blogname' => $blogname, + 'blog_title' => $blog_title, + 'errors' => $errors + ); + + /** + * Filter the default site creation variables. + * + * @since 3.0.0 + * + * @param array $signup_blog_default An array of default site creation variables. + */ + $filtered_results = apply_filters( 'signup_blog_init', $signup_blog_default ); $user_name = $filtered_results['user_name']; $user_email = $filtered_results['user_email']; $blogname = $filtered_results['blogname']; @@ -487,6 +577,8 @@ $public = (int) $_POST['blog_public']; $meta = array ('lang_id' => 1, 'public' => $public); + + //duplicate_hook $meta = apply_filters( 'add_signup_meta', $meta ); wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta); @@ -523,12 +615,21 @@

- +