Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Eliminate use of `extract()` in `validate_another_blog_signup()`. 

The extracted variables set/overwrite globals. `$user` does not need to be pulled from `validate_blog_form()` as it is not used in this function.

See #22400.

Built from https://develop.svn.wordpress.org/trunk@28445


git-svn-id: http://core.svn.wordpress.org/trunk@28272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-16 14:43:25 +00:00
parent 5c2d25aa77
commit ac93f6742e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-signup.php
View File

@ -315,7 +315,13 @@ function validate_another_blog_signup() {
die();
$result = validate_blog_form();
extract($result);
// extracted values set/overwrite globals
$domain = $result['domain'];
$path = $result['path'];
$blogname = $result['blogname'];
$blog_title = $result['blog_title'];
$errors = $result['errors'];
if ( $errors->get_error_code() ) {
signup_another_blog($blogname, $blog_title, $errors);
@ -337,7 +343,7 @@ function validate_another_blog_signup() {
*
* @param array $blog_meta_defaults An array of default blog meta variables.
*/
$meta = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults );
$meta_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults );
/**
* Filter the new default site meta variables.
*
@ -350,7 +356,7 @@ function validate_another_blog_signup() {
* @type int $blog_public Whether search engines should be discouraged from indexing the site. 1 for true, 0 for false.
* }
*/
$meta = apply_filters( 'add_signup_meta', $meta );
$meta = apply_filters( 'add_signup_meta', $meta_defaults );
wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);