From e3e565321cb7e289f4c8ee30897d12d644373f3d Mon Sep 17 00:00:00 2001 From: markjaquith Date: Mon, 24 May 2010 19:18:30 +0000 Subject: [PATCH] stripslashes() the site name before passing to populate_network(), not in it. We should always expect unslashed data. reverts [14754]. fixes #13448 git-svn-id: http://svn.automattic.com/wordpress/trunk@14845 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 2 +- wp-admin/network.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index c77231301..5a0ed3120 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -689,7 +689,7 @@ Thanks! --The Team @ SITE_NAME' ); $sitemeta = array( - 'site_name' => stripslashes($site_name), + 'site_name' => $site_name, 'admin_email' => $site_user->user_email, 'admin_user_id' => $site_user->ID, 'registration' => 'none', diff --git a/wp-admin/network.php b/wp-admin/network.php index 2fe58a434..18d9c8fd7 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -381,7 +381,7 @@ if ( $_POST ) { $hostname = get_clean_basedomain(); $subdomain_install = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install']; if ( ! network_domain_check() ) { - $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['sitename'], $base, $subdomain_install ); + $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install ); if ( is_wp_error( $result ) ) { if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() ) network_step2( $result );