Changeset 23592

Timestamp:

03/03/2013 04:55:53 PM (14 years ago)

Author:

ryan

Message:

In ms-functions.php, remove unnecessary slashing, don't strip the return of get_site_option, s/stripslashes*/wp_unslash/.

see #21767

File:

• trunk/wp-includes/ms-functions.php (modified) (12 diffs)

trunk/wp-includes/ms-functions.php

@@ -280 +280 @@
  */
 function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
-        $domain                 = addslashes( $domain );
-        $weblog_title   = addslashes( $weblog_title );
-
         if ( empty($path) )
                 $path = '/';
@@ -583 +580 @@
         $blogname = apply_filters( 'newblogname', $blogname );
 
-        $blog_title = stripslashes(  $blog_title );
+        $blog_title = wp_unslash(  $blog_title );
 
         if ( empty( $blog_title ) )
@@ -637 +634 @@
         $key = substr( md5( time() . rand() . $domain ), 0, 16 );
         $meta = serialize($meta);
-        $domain = $wpdb->escape($domain);
-        $path = $wpdb->escape($path);
-        $title = $wpdb->escape($title);
 
         $wpdb->insert( $wpdb->signups, array(
@@ -841 +835 @@
 
         $meta = maybe_unserialize($signup->meta);
-        $user_login = $wpdb->escape($signup->user_login);
-        $user_email = $wpdb->escape($signup->user_email);
         $password = wp_generate_password( 12, false );
 
@@ -848 +840 @@
 
         if ( ! $user_id )
-                $user_id = wpmu_create_user($user_login, $password, $user_email);
+                $user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
         else
                 $user_already_exists = true;
@@ -1025 +1017 @@
 Remote IP: %3$s
 
-Disable these notifications: %4$s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url);
+Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
         $msg = apply_filters( 'newblog_notify_siteadmin', $msg );
 
@@ -1059 +1051 @@
 Remote IP: %2$s
 
-Disable these notifications: %3$s'), $user->user_login, $_SERVER['REMOTE_ADDR'], $options_site_url);
+Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
 
         $msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
@@ -1158 +1150 @@
                 update_option( 'upload_path', get_blog_option( $current_site->blog_id, 'upload_path' ) );
 
-        update_option( 'blogname', stripslashes( $blog_title ) );
+        update_option( 'blogname', wp_unslash( $blog_title ) );
         update_option( 'admin_email', '' );
 
@@ -1215 +1207 @@
                 return false;
 
-        $welcome_email = stripslashes( get_site_option( 'welcome_email' ) );
+        $welcome_email = get_site_option( 'welcome_email' );
         if ( $welcome_email == false )
-                $welcome_email = stripslashes( __( 'Dear User,
+                $welcome_email = __( 'Dear User,
 
 Your new SITE_NAME site has been successfully set up at:
@@ -1229 +1221 @@
 We hope you enjoy your new site. Thanks!
 
---The Team @ SITE_NAME' ) );
+--The Team @ SITE_NAME' );
 
         $url = get_blogaddress_by_id($blog_id);
@@ -1253 +1245 @@
                 $current_site->site_name = 'WordPress';
 
-        $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, stripslashes( $title ) ) );
+        $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, wp_unslash( $title ) ) );
         wp_mail($user->user_email, $subject, $message, $message_headers);
         return true;
@@ -1482 +1474 @@
         global $wpdb;
         $user = get_userdata( (int) $user_id );
-        $wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '',$_SERVER['REMOTE_ADDR'] ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+        $wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
 }