Ticket #25149: 25149.patch

src/wp-includes/ms-functions.php

@@ -625 +625 @@
  * @param string $user_email The user's email address.
  * @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;
 
         $key = substr( md5( time() . rand() . $domain ), 0, 16 );
@@ -658 +658 @@
  * @param string $user_email The user's email address.
  * @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;
 
         // Format data
@@ -701 +701 @@
  * @param string $title The site title.
  * @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;
 
         if ( !apply_filters('wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta) )
@@ -762 +762 @@
  *
  * @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;
 
@@ -936 +936 @@
  * @param int $site_id Optional. Only relevant on multi-network installs.
  * @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 );
 
@@ -1200 +1200 @@
  * @param array $meta Optional. Not used in the default function, but is passed along to hooks for customization.
  * @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;
 
         if ( !apply_filters('wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta) )
@@ -1264 +1264 @@
  * @param array $meta Optional. Not used in the default function, but is passed along to hooks for customization.
  * @return bool
  */
-function wpmu_welcome_user_notification($user_id, $password, $meta = '') {
+function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
         global $current_site;
 
         if ( !apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta) )