Changeset 39886 for trunk/src/wp-includes/ms-functions.php

Timestamp:

01/12/2017 04:56:28 AM (8 years ago)

Author:

SergeyBiryukov

Message:

Users: In wpmu_signup_blog() and wpmu_signup_user(), pass unserialized signup meta data to after_signup_site and after_signup_user filters introduced in [34112], to match the documented value.

Props MaximeCulea.
Fixes #38781.

File:

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

trunk/src/wp-includes/ms-functions.php

@@ -665 +665 @@
  * @param string $user       The user's requested login name.
  * @param string $user_email The user's email address.
- * @param array  $meta       By default, contains the requested privacy setting and lang_id.
+ * @param array  $meta       Optional. Signup meta data. By default, contains the requested privacy setting and lang_id.
  */
 function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() )  {
@@ -671 +671 @@
 
     $key = substr( md5( time() . wp_rand() . $domain ), 0, 16 );
-    $meta = serialize($meta);
 
     $wpdb->insert( $wpdb->signups, array(
@@ -681 +680 @@
         'registered' => current_time('mysql', true),
         'activation_key' => $key,
-        'meta' => $meta
+        'meta' => serialize( $meta )
     ) );
 
@@ -694 +693 @@
      * @param string $user       The user's requested login name.
      * @param string $user_email The user's email address.
-     * @param string $key        The user's activation key
-     * @param array  $meta       By default, contains the requested privacy setting and lang_id.
+     * @param string $key        The user's activation key.
+     * @param array  $meta       Signup meta data. By default, contains the requested privacy setting and lang_id.
      */
     do_action( 'after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta );
@@ -712 +711 @@
  * @param string $user       The user's requested login name.
  * @param string $user_email The user's email address.
- * @param array  $meta       By default, this is an empty array.
+ * @param array  $meta       Optional. Signup meta data. Default empty array.
  */
 function wpmu_signup_user( $user, $user_email, $meta = array() ) {
@@ -721 +720 @@
     $user_email = sanitize_email( $user_email );
     $key = substr( md5( time() . wp_rand() . $user_email ), 0, 16 );
-    $meta = serialize($meta);
 
     $wpdb->insert( $wpdb->signups, array(
@@ -731 +729 @@
         'registered' => current_time('mysql', true),
         'activation_key' => $key,
-        'meta' => $meta
+        'meta' => serialize( $meta )
     ) );
 
@@ -741 +739 @@
      * @param string $user       The user's requested login name.
      * @param string $user_email The user's email address.
-     * @param string $key        The user's activation key
-     * @param array  $meta       Additional signup meta. By default, this is an empty array.
+     * @param string $key        The user's activation key.
+     * @param array  $meta       Signup meta data. Default empty array.
      */
     do_action( 'after_signup_user', $user, $user_email, $key, $meta );