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

Timestamp:

09/02/2013 03:32:49 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Use an array as a default value for $meta in multisite signup-related functions. fixes #25149.

File:

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

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

@@ -629 +629 @@
  * @param array $meta By default, contains the requested privacy setting and lang_id.
  */
-function wpmu_signup_blog($domain, $path, $title, $user, $user_email, $meta = '') {
+function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() )  {
     global $wpdb;
 
@@ -662 +662 @@
  * @param array $meta By default, this is an empty array.
  */
-function wpmu_signup_user($user, $user_email, $meta = '') {
+function wpmu_signup_user( $user, $user_email, $meta = array() ) {
     global $wpdb;
 
@@ -705 +705 @@
  * @param string $user The user's login name.
  * @param string $user_email The user's email address.
+ * @param string $key The activation key created in wpmu_signup_blog()
  * @param array $meta By default, contains the requested privacy setting and lang_id.
- * @param string $key The activation key created in wpmu_signup_blog()
  * @return bool
  */
-function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_email, $key, $meta = '') {
+function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) {
     global $current_site;
 
@@ -766 +766 @@
  * @param string $user The user's login name.
  * @param string $user_email The user's email address.
+ * @param string $key The activation key created in wpmu_signup_user()
  * @param array $meta By default, an empty array.
- * @param string $key The activation key created in wpmu_signup_user()
  * @return bool
  */
-function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') {
+function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array() ) {
     if ( !apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta) )
         return false;
@@ -938 +938 @@
  * @return mixed Returns WP_Error object on failure, int $blog_id on success
  */
-function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = '', $site_id = 1 ) {
+function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
     $defaults = array( 'public' => 0 );
     $meta = wp_parse_args( $meta, $defaults );
@@ -1202 +1202 @@
  * @return bool
  */
-function wpmu_welcome_notification($blog_id, $user_id, $password, $title, $meta = '') {
+function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) {
     global $current_site;
 
@@ -1266 +1266 @@
  * @return bool
  */
-function wpmu_welcome_user_notification($user_id, $password, $meta = '') {
+function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
     global $current_site;