Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-28 07:45:02 +02:00
Code Issues Projects Releases Wiki Activity

stripslashes() the site name before passing to populate_network(), not in it. We should always expect unslashed data. reverts [14754]. fixes #13448

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-05-24 19:18:30 +00:00
parent e2edbfc768
commit e3e565321c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/schema.php
View File

@ -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',

2
wp-admin/network.php
View File

@ -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 );