Ticket #36927: 36927.diff
File 36927.diff, 5.8 KB (added by , 9 years ago) |
---|
-
src/wp-signup.php
91 91 * 92 92 * @since MU 93 93 * 94 * @param string $blogname The new site name95 * @param string $blog_title The new site title96 * @param array $errors94 * @param string $blogname The new site name. 95 * @param string $blog_title The new site title. 96 * @param WP_Error|string $errors A WP_Error object containing existing errors. Defaults to empty string. 97 97 */ 98 98 function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) { 99 if ( ! is_wp_error( $errors ) ) { 100 $errors = new WP_Error(); 101 } 102 99 103 $current_site = get_current_site(); 100 104 // Blog name 101 105 if ( !is_subdomain_install() ) … … 183 187 * 184 188 * @since 3.0.0 185 189 * 186 * @param array $errors An arraypossibly containing 'blogname' or 'blog_title' errors.190 * @param WP_Error $errors A WP_Error object possibly containing 'blogname' or 'blog_title' errors. 187 191 */ 188 192 do_action( 'signup_blogform', $errors ); 189 193 } … … 208 212 * 209 213 * @since MU 210 214 * 211 * @param string $user_name The entered username212 * @param string $user_email The entered email address213 * @param array $errors215 * @param string $user_name The entered username. 216 * @param string $user_email The entered email address. 217 * @param WP_Error|string $errors A WP_Error object containing existing errors. Defaults to empty string. 214 218 */ 215 219 function show_user_form($user_name = '', $user_email = '', $errors = '') { 220 if ( ! is_wp_error( $errors ) ) { 221 $errors = new WP_Error(); 222 } 223 216 224 // User name 217 225 echo '<label for="user_name">' . __('Username:') . '</label>'; 218 226 if ( $errmsg = $errors->get_error_message('user_name') ) { … … 236 244 * 237 245 * @since 3.0.0 238 246 * 239 * @param array $errors An array possiblycontaining 'user_name' or 'user_email' errors.247 * @param WP_Error $errors A WP_Error object containing containing 'user_name' or 'user_email' errors. 240 248 */ 241 249 do_action( 'signup_extra_fields', $errors ); 242 250 } … … 257 265 * 258 266 * @since MU 259 267 * 260 * @param string $blognameThe new site name261 * @param string $blog_title The new site title.262 * @param array $errors268 * @param string $blogname The new site name 269 * @param string $blog_title The new site title. 270 * @param WP_Error|string $errors A WP_Error object containing existing errors. Defaults to empty string. 263 271 */ 264 272 function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { 265 273 $current_user = wp_get_current_user(); … … 282 290 * @param array $signup_defaults { 283 291 * An array of default site sign-up variables. 284 292 * 285 * @type string $blogname The site blogname.286 * @type string $blog_title The site title.287 * @type array $errors An arraypossibly containing 'blogname' or 'blog_title' errors.293 * @type string $blogname The site blogname. 294 * @type string $blog_title The site title. 295 * @type WP_Error $errors A WP_Error object possibly containing 'blogname' or 'blog_title' errors. 288 296 * } 289 297 */ 290 298 $filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults ); … … 477 485 * 478 486 * @since MU 479 487 * 480 * @param string $user_name The username481 * @param string $user_email The user's email482 * @param array $errors488 * @param string $user_name The username. 489 * @param string $user_email The user's email. 490 * @param WP_Error|string $errors A WP_Error object containing existing errors. Defaults to empty string. 483 491 */ 484 492 function signup_user( $user_name = '', $user_email = '', $errors = '' ) { 485 493 global $active_signup; … … 503 511 * @param array $signup_user_defaults { 504 512 * An array of default user variables. 505 513 * 506 * @type string $user_name The user username.507 * @type string $user_email The user email address.508 * @type array $errors An array ofpossible errors relevant to the sign-up user.514 * @type string $user_name The user username. 515 * @type string $user_email The user email address. 516 * @type WP_Error $errors A WP_Error object with possible errors relevant to the sign-up user. 509 517 * } 510 518 */ 511 519 $filtered_results = apply_filters( 'signup_user_init', $signup_user_defaults ); … … 599 607 * 600 608 * @since MU 601 609 * 602 * @param string $user_name The username603 * @param string $user_email The user's email address604 * @param string $blogname The site name605 * @param string $blog_title The site title606 * @param array $errors610 * @param string $user_name The username. 611 * @param string $user_email The user's email address. 612 * @param string $blogname The site name. 613 * @param string $blog_title The site title. 614 * @param WP_Error|string $errors A WP_Error object containing existing errors. Defaults to empty string. 607 615 */ 608 616 function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') { 609 617 if ( !is_wp_error($errors) ) … … 625 633 * @param array $signup_blog_defaults { 626 634 * An array of default site creation variables. 627 635 * 628 * @type string $user_name The user username.629 * @type string $user_email The user email address.630 * @type string $blogname The blogname.631 * @type string $blog_title The title of the site.632 * @type array $errors An array ofpossible errors relevant to new site creation variables.636 * @type string $user_name The user username. 637 * @type string $user_email The user email address. 638 * @type string $blogname The blogname. 639 * @type string $blog_title The title of the site. 640 * @type WP_Error $errors A WP_Error object with possible errors relevant to new site creation variables. 633 641 * } 634 642 */ 635 643 $filtered_results = apply_filters( 'signup_blog_init', $signup_blog_defaults );