Changeset 14845

Timestamp:

05/24/2010 07:18:30 PM (15 years ago)

Author:

markjaquith

Message:

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

Location:

trunk/wp-admin

Files:

• includes/schema.php (modified) (1 diff)
• network.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -690 +690 @@
 
     $sitemeta = array(
-        'site_name' => stripslashes($site_name),
+        'site_name' => $site_name,
         'admin_email' => $site_user->user_email,
         'admin_user_id' => $site_user->ID,

trunk/wp-admin/network.php

@@ -382 +382 @@
     $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() )