X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/af50974463450c98503e763a7836a50e260461a9..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-includes/ms-functions.php
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 5537fb36..edbb9842 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -28,9 +28,11 @@ function get_sitestats() {
*
* @since MU 1.0
*
+ * @global wpdb $wpdb
+ *
* @param string $sitedomain Optional. Site domain.
- * @param string $path Optional. Site path.
- * @return array The network admins
+ * @param string $path Optional. Site path.
+ * @return array|false The network admins
*/
function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
global $wpdb;
@@ -57,14 +59,16 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
*
* @since MU 1.0
*
+ * @global wpdb $wpdb
+ *
* @param int $user_id The unique ID of the user
- * @return object The blog object
+ * @return object|void The blog object
*/
function get_active_blog_for_user( $user_id ) {
global $wpdb;
$blogs = get_blogs_of_user( $user_id );
if ( empty( $blogs ) )
- return null;
+ return;
if ( !is_multisite() )
return $blogs[$wpdb->blogid];
@@ -103,7 +107,7 @@ function get_active_blog_for_user( $user_id ) {
}
}
} else {
- return null;
+ return;
}
return $ret;
} else {
@@ -166,10 +170,10 @@ function get_blog_post( $blog_id, $post_id ) {
*
* @since MU 1.0
*
- * @param int $blog_id ID of the blog you're adding the user to.
- * @param int $user_id ID of the user you're adding.
- * @param string $role The role you want the user to have
- * @return bool
+ * @param int $blog_id ID of the blog you're adding the user to.
+ * @param int $user_id ID of the user you're adding.
+ * @param string $role The role you want the user to have
+ * @return true|WP_Error
*/
function add_user_to_blog( $blog_id, $user_id, $role ) {
switch_to_blog($blog_id);
@@ -200,6 +204,7 @@ function add_user_to_blog( $blog_id, $user_id, $role ) {
*/
do_action( 'add_user_to_blog', $user_id, $role, $blog_id );
wp_cache_delete( $user_id, 'users' );
+ wp_cache_delete( $blog_id . '_user_count', 'blog-details' );
restore_current_blog();
return true;
}
@@ -215,10 +220,12 @@ function add_user_to_blog( $blog_id, $user_id, $role ) {
*
* @since MU 1.0
*
- * @param int $user_id ID of the user you're removing.
- * @param int $blog_id ID of the blog you're removing the user from.
+ * @global wpdb $wpdb
+ *
+ * @param int $user_id ID of the user you're removing.
+ * @param int $blog_id ID of the blog you're removing the user from.
* @param string $reassign Optional. A user to whom to reassign posts.
- * @return bool
+ * @return true|WP_Error
*/
function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
global $wpdb;
@@ -294,11 +301,11 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
*
* @since MU 1.0
*
- * @param string $domain The new blog's domain.
- * @param string $path The new blog's path.
+ * @param string $domain The new blog's domain.
+ * @param string $path The new blog's path.
* @param string $weblog_title The new blog's title.
- * @param int $site_id Optional. Defaults to 1.
- * @return int The ID of the newly created blog
+ * @param int $site_id Optional. Defaults to 1.
+ * @return string|int The ID of the newly created blog
*/
function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
if ( empty($path) )
@@ -349,8 +356,10 @@ function get_blog_permalink( $blog_id, $post_id ) {
*
* @since MU 2.6.5
*
+ * @global wpdb $wpdb
+ *
* @param string $domain
- * @param string $path Optional. Not required for subdomain installations.
+ * @param string $path Optional. Not required for subdomain installations.
* @return int 0 if no blog found, otherwise the ID of the matching blog
*/
function get_blog_id_from_url( $domain, $path = '/' ) {
@@ -434,23 +443,22 @@ function is_email_address_unsafe( $user_email ) {
}
/**
- * Processes new user registrations.
+ * Sanitize and validate data required for a user sign-up.
*
- * Checks the data provided by the user during signup. Verifies
- * the validity and uniqueness of user names and user email addresses,
- * and checks email addresses against admin-provided domain
- * whitelists and blacklists.
+ * Verifies the validity and uniqueness of user names and user email addresses,
+ * and checks email addresses against admin-provided domain whitelists and blacklists.
*
- * The hook 'wpmu_validate_user_signup' provides an easy way
- * to modify the signup process. The value $result, which is passed
- * to the hook, contains both the user-provided info and the error
- * messages created by the function. 'wpmu_validate_user_signup' allows
- * you to process the data in any way you'd like, and unset the
- * relevant errors if necessary.
+ * The {@see 'wpmu_validate_user_signup'} hook provides an easy way to modify the sign-up
+ * process. The value $result, which is passed to the hook, contains both the user-provided
+ * info and the error messages created by the function. {@see 'wpmu_validate_user_signup'}
+ * allows you to process the data in any way you'd like, and unset the relevant errors if
+ * necessary.
*
* @since MU
*
- * @param string $user_name The login name provided by the user.
+ * @global wpdb $wpdb
+ *
+ * @param string $user_name The login name provided by the user.
* @param string $user_email The email provided by the user.
* @return array Contains username, email, and error messages.
*/
@@ -473,11 +481,11 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$errors->add('user_name', __( 'Please enter a username.' ) );
$illegal_names = get_site_option( 'illegal_names' );
- if ( is_array( $illegal_names ) == false ) {
+ if ( ! is_array( $illegal_names ) ) {
$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
add_site_option( 'illegal_names', $illegal_names );
}
- if ( in_array( $user_name, $illegal_names ) == true )
+ if ( in_array( $user_name, $illegal_names ) )
$errors->add('user_name', __( 'That username is not allowed.' ) );
if ( is_email_address_unsafe( $user_email ) )
@@ -486,7 +494,11 @@ function wpmu_validate_user_signup($user_name, $user_email) {
if ( strlen( $user_name ) < 4 )
$errors->add('user_name', __( 'Username must be at least 4 characters.' ) );
- if ( strpos( ' ' . $user_name, '_' ) != false )
+ if ( strlen( $user_name ) > 60 ) {
+ $errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
+ }
+
+ if ( strpos( $user_name, '_' ) !== false )
$errors->add( 'user_name', __( 'Sorry, usernames may not contain the character “_”!' ) );
// all numeric?
@@ -497,10 +509,11 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$errors->add('user_email', __( 'Please enter a valid email address.' ) );
$limited_email_domains = get_site_option( 'limited_email_domains' );
- if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
+ if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
$emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
- if ( in_array( $emaildomain, $limited_email_domains ) == false )
+ if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
$errors->add('user_email', __('Sorry, that email address is not allowed!'));
+ }
}
// Check if the username has been used already.
@@ -572,7 +585,10 @@ function wpmu_validate_user_signup($user_name, $user_email) {
*
* @since MU
*
- * @param string $blogname The blog name provided by the user. Must be unique.
+ * @global wpdb $wpdb
+ * @global string $domain
+ *
+ * @param string $blogname The blog name provided by the user. Must be unique.
* @param string $blog_title The blog title provided by the user.
* @return array Contains the new site data and error messages.
*/
@@ -616,7 +632,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
$errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
- if ( in_array( $blogname, $illegal_names ) == true )
+ if ( in_array( $blogname, $illegal_names ) )
$errors->add('blogname', __( 'That name is not allowed.' ) );
if ( strlen( $blogname ) < 4 && !is_super_admin() )
@@ -662,7 +678,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
if ( username_exists( $blogname ) ) {
- if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) )
+ if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
}
@@ -703,12 +719,14 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
*
* @since MU
*
- * @param string $domain The requested domain.
- * @param string $path The requested path.
- * @param string $title The requested site title.
- * @param string $user The user's requested login name.
+ * @global wpdb $wpdb
+ *
+ * @param string $domain The requested domain.
+ * @param string $path The requested path.
+ * @param string $title The requested site title.
+ * @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 By default, contains the requested privacy setting and lang_id.
*/
function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() ) {
global $wpdb;
@@ -738,9 +756,11 @@ function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = a
*
* @since MU
*
- * @param string $user The user's requested login name.
+ * @global wpdb $wpdb
+ *
+ * @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 By default, this is an empty array.
*/
function wpmu_signup_user( $user, $user_email, $meta = array() ) {
global $wpdb;
@@ -780,13 +800,13 @@ function wpmu_signup_user( $user, $user_email, $meta = array() ) {
*
* @since MU
*
- * @param string $domain The new blog domain.
- * @param string $path The new blog path.
- * @param string $title The site title.
- * @param string $user The user's login name.
+ * @param string $domain The new blog domain.
+ * @param string $path The new blog path.
+ * @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()
+ * @param array $meta By default, contains the requested privacy setting and lang_id.
* @return bool
*/
function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) {
@@ -886,10 +906,10 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_ema
*
* @since MU
*
- * @param string $user The user's login name.
+ * @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()
+ * @param array $meta By default, an empty array.
* @return bool
*/
function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array() ) {
@@ -966,8 +986,10 @@ function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array(
*
* @since MU
*
+ * @global wpdb $wpdb
+ *
* @param string $key The activation key provided to the user.
- * @return array An array containing information about the activated user and/or blog
+ * @return array|WP_Error An array containing information about the activated user and/or blog
*/
function wpmu_activate_signup($key) {
global $wpdb;
@@ -1061,9 +1083,9 @@ function wpmu_activate_signup($key) {
* @since MU
*
* @param string $user_name The new user's login name.
- * @param string $password The new user's password.
- * @param string $email The new user's email address.
- * @return int|bool Returns false on failure, or int $user_id on success
+ * @param string $password The new user's password.
+ * @param string $email The new user's email address.
+ * @return int|false Returns false on failure, or int $user_id on success
*/
function wpmu_create_user( $user_name, $password, $email ) {
$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
@@ -1102,13 +1124,13 @@ function wpmu_create_user( $user_name, $password, $email ) {
*
* @since MU
*
- * @param string $domain The new site's domain.
- * @param string $path The new site's path.
- * @param string $title The new site's title.
- * @param int $user_id The user ID of the new site's admin.
- * @param array $meta Optional. Used to set initial site options.
- * @param int $site_id Optional. Only relevant on multi-network installs.
- * @return mixed Returns WP_Error object on failure, int $blog_id on success
+ * @param string $domain The new site's domain.
+ * @param string $path The new site's path.
+ * @param string $title The new site's title.
+ * @param int $user_id The user ID of the new site's admin.
+ * @param array $meta Optional. Used to set initial site options.
+ * @param int $site_id Optional. Only relevant on multi-network installs.
+ * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success
*/
function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
$defaults = array( 'public' => 0 );
@@ -1267,9 +1289,11 @@ Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['RE
*
* @since MU
*
- * @param string $domain The domain to be checked.
- * @param string $path The path to be checked.
- * @param int $site_id Optional. Relevant only on multi-network installs.
+ * @global wpdb $wpdb
+ *
+ * @param string $domain The domain to be checked.
+ * @param string $path The path to be checked.
+ * @param int $site_id Optional. Relevant only on multi-network installs.
* @return int
*/
function domain_exists($domain, $path, $site_id = 1) {
@@ -1298,10 +1322,12 @@ function domain_exists($domain, $path, $site_id = 1) {
*
* @since MU
*
- * @param string $domain The domain of the new site.
- * @param string $path The path of the new site.
- * @param int $site_id Unless you're running a multi-network install, be sure to set this value to 1.
- * @return int The ID of the new row
+ * @global wpdb $wpdb
+ *
+ * @param string $domain The domain of the new site.
+ * @param string $path The path of the new site.
+ * @param int $site_id Unless you're running a multi-network install, be sure to set this value to 1.
+ * @return int|false The ID of the new row
*/
function insert_blog($domain, $path, $site_id) {
global $wpdb;
@@ -1330,7 +1356,10 @@ function insert_blog($domain, $path, $site_id) {
*
* @since MU
*
- * @param int $blog_id The value returned by insert_blog().
+ * @global wpdb $wpdb
+ * @global WP_Roles $wp_roles
+ *
+ * @param int $blog_id The value returned by insert_blog().
* @param string $blog_title The title of the new site.
*/
function install_blog( $blog_id, $blog_title = '' ) {
@@ -1384,6 +1413,8 @@ function install_blog( $blog_id, $blog_title = '' ) {
* @deprecated MU
* @deprecated Use wp_install_defaults()
*
+ * @global wpdb $wpdb
+ *
* @param int $blog_id Ignored in this function.
* @param int $user_id
*/
@@ -1409,11 +1440,11 @@ function install_blog_defaults($blog_id, $user_id) {
*
* @since MU
*
- * @param int $blog_id
- * @param int $user_id
+ * @param int $blog_id
+ * @param int $user_id
* @param string $password
- * @param string $title The new blog's title
- * @param array $meta Optional. Not used in the default function, but is passed along to hooks for customization.
+ * @param string $title The new blog's title
+ * @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 = array() ) {
@@ -1436,8 +1467,9 @@ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta
return false;
$welcome_email = get_site_option( 'welcome_email' );
- if ( $welcome_email == false )
- $welcome_email = __( 'Dear User,
+ if ( $welcome_email == false ) {
+ /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
+ $welcome_email = __( 'Howdy USERNAME,
Your new SITE_NAME site has been successfully set up at:
BLOG_URL
@@ -1451,6 +1483,7 @@ Log in here: BLOG_URLwp-login.php
We hope you enjoy your new site. Thanks!
--The Team @ SITE_NAME' );
+ }
$url = get_blogaddress_by_id($blog_id);
$user = get_userdata( $user_id );
@@ -1510,9 +1543,9 @@ We hope you enjoy your new site. Thanks!
*
* @since MU
*
- * @param int $user_id
+ * @param int $user_id
* @param string $password
- * @param array $meta Optional. Not used in the default function, but is passed along to hooks for customization.
+ * @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 = array() ) {
@@ -1588,6 +1621,8 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
*
* @since MU
*
+ * @global object $current_site
+ *
* @return object
*/
function get_current_site() {
@@ -1603,6 +1638,8 @@ function get_current_site() {
*
* @since MU
*
+ * @global wpdb $wpdb
+ *
* @param int $user_id
* @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts
*/
@@ -1649,18 +1686,24 @@ function get_most_recent_post_of_user( $user_id ) {
*
* @since MU
*
- * @param string $directory
- * @return int
+ * @param string $directory Full path of a directory.
+ * @return int Size of the directory in MB.
*/
function get_dirsize( $directory ) {
$dirsize = get_transient( 'dirsize_cache' );
if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
return $dirsize[ $directory ][ 'size' ];
- if ( false == is_array( $dirsize ) )
+ if ( ! is_array( $dirsize ) )
$dirsize = array();
- $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+ // Exclude individual site directories from the total when checking the main site,
+ // as they are subdirectories and should not be counted.
+ if ( is_main_site() ) {
+ $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $directory . '/sites' );
+ } else {
+ $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+ }
set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
return $dirsize[ $directory ][ 'size' ];
@@ -1673,17 +1716,20 @@ function get_dirsize( $directory ) {
* other directories.
*
* @since MU
+ * @since 4.3.0 $exclude parameter added.
*
- * @param string $directory
- * @return int
+ * @param string $directory Full path of a directory.
+ * @param string $exclude Optional. Full path of a subdirectory to exclude from the total.
+ * @return int|false Size in MB if a valid directory. False if not.
*/
-function recurse_dirsize( $directory ) {
+function recurse_dirsize( $directory, $exclude = null ) {
$size = 0;
$directory = untrailingslashit( $directory );
- if ( !file_exists($directory) || !is_dir( $directory ) || !is_readable( $directory ) )
+ if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) {
return false;
+ }
if ($handle = opendir($directory)) {
while(($file = readdir($handle)) !== false) {
@@ -1692,7 +1738,7 @@ function recurse_dirsize( $directory ) {
if (is_file($path)) {
$size += filesize($path);
} elseif (is_dir($path)) {
- $handlesize = recurse_dirsize($path);
+ $handlesize = recurse_dirsize( $path, $exclude );
if ($handlesize > 0)
$size += $handlesize;
}
@@ -1738,6 +1784,8 @@ function check_upload_mimes( $mimes ) {
* are published or unpublished to make sure the count stays current.
*
* @since MU
+ *
+ * @global wpdb $wpdb
*/
function update_posts_count( $deprecated = '' ) {
global $wpdb;
@@ -1749,6 +1797,8 @@ function update_posts_count( $deprecated = '' ) {
*
* @since MU
*
+ * @global wpdb $wpdb
+ *
* @param int $blog_id
* @param int $user_id
*/
@@ -1766,6 +1816,9 @@ function wpmu_log_new_registrations( $blog_id, $user_id ) {
*
* @see term_id_filter
*
+ * @global wpdb $wpdb
+ * @staticvar int $global_terms_recurse
+ *
* @param int $term_id An ID for a term on the current blog.
* @return int An ID from the global terms table mapped from $term_id.
*/
@@ -1804,11 +1857,13 @@ function global_terms( $term_id, $deprecated = '' ) {
$global_id = $wpdb->insert_id;
}
} elseif ( $global_id != $term_id ) {
- $local_id = $wpdb->get_row( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
- if ( null != $local_id )
- $local_id = global_terms( $local_id );
- if ( 10 < $global_terms_recurse )
+ $local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
+ if ( null != $local_id ) {
+ global_terms( $local_id );
+ if ( 10 < $global_terms_recurse ) {
$global_id = $term_id;
+ }
+ }
}
if ( $global_id != $term_id ) {
@@ -1821,7 +1876,7 @@ function global_terms( $term_id, $deprecated = '' ) {
clean_term_cache($term_id);
}
- if( $recurse_start )
+ if ( $recurse_start )
$global_terms_recurse = null;
return $global_id;
@@ -1845,10 +1900,10 @@ function redirect_this_site( $deprecated = '' ) {
* @since MU
*
* @param array $upload
- * @return mixed If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
+ * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
*/
function upload_is_file_too_big( $upload ) {
- if ( is_array( $upload ) == false || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
+ if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
return $upload;
if ( strlen( $upload['bits'] ) > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
@@ -1920,7 +1975,7 @@ function maybe_redirect_404() {
*/
function maybe_add_existing_user_to_blog() {
if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
- return false;
+ return;
$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
$key = array_pop( $parts );
@@ -1935,7 +1990,7 @@ function maybe_add_existing_user_to_blog() {
if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
wp_die( sprintf(__('An error occurred adding you to this site. Back to the homepage.'), home_url() ) );
- wp_die( sprintf( __( 'You have been added to this site. Please visit the homepage or log in using your username and password.' ), home_url(), admin_url() ), __( 'WordPress › Success' ) );
+ wp_die( sprintf( __( 'You have been added to this site. Please visit the homepage or log in using your username and password.' ), home_url(), admin_url() ), __( 'WordPress › Success' ), array( 'response' => 200 ) );
}
/**
@@ -1943,7 +1998,10 @@ function maybe_add_existing_user_to_blog() {
*
* @since MU
*
+ * @global int $blog_id
+ *
* @param array $details
+ * @return true|WP_Error|void
*/
function add_existing_user_to_blog( $details = false ) {
global $blog_id;
@@ -1959,8 +2017,8 @@ function add_existing_user_to_blog( $details = false ) {
* @param mixed $result True on success or a WP_Error object if the user doesn't exist.
*/
do_action( 'added_existing_user', $details['user_id'], $result );
+ return $result;
}
- return $result;
}
/**
@@ -1972,7 +2030,7 @@ function add_existing_user_to_blog( $details = false ) {
* @since MU
* @see add_user_to_blog()
*
- * @param int $user_id
+ * @param int $user_id
* @param mixed $password Ignored.
* @param array $meta
*/
@@ -2001,15 +2059,16 @@ function fix_phpmailer_messageid( $phpmailer ) {
* @since MU
*
* @param string|WP_User $user Optional. Defaults to current user. WP_User object,
- * or user login name as a string.
+ * or user login name as a string.
* @return bool
*/
function is_user_spammy( $user = null ) {
- if ( ! is_a( $user, 'WP_User' ) ) {
- if ( $user )
+ if ( ! ( $user instanceof WP_User ) ) {
+ if ( $user ) {
$user = get_user_by( 'login', $user );
- else
+ } else {
$user = wp_get_current_user();
+ }
}
return $user && isset( $user->spam ) && 1 == $user->spam;
@@ -2023,21 +2082,22 @@ function is_user_spammy( $user = null ) {
* @since MU
*
* @param int $old_value
- * @param int $value The new public value
+ * @param int $value The new public value
*/
function update_blog_public( $old_value, $value ) {
update_blog_status( get_current_blog_id(), 'public', (int) $value );
}
-add_action('update_option_blog_public', 'update_blog_public', 10, 2);
/**
* Check whether a usermeta key has to do with the current blog.
*
* @since MU
*
+ * @global wpdb $wpdb
+ *
* @param string $key
- * @param int $user_id Optional. Defaults to current user.
- * @param int $blog_id Optional. Defaults to current blog.
+ * @param int $user_id Optional. Defaults to current user.
+ * @param int $blog_id Optional. Defaults to current blog.
* @return bool
*/
function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
@@ -2049,10 +2109,7 @@ function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
}
$local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
- if ( isset( $current_user->$local_key ) )
- return true;
-
- return false;
+ return isset( $current_user->$local_key );
}
/**
@@ -2064,12 +2121,8 @@ function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
*/
function users_can_register_signup_filter() {
$registration = get_site_option('registration');
- if ( $registration == 'all' || $registration == 'user' )
- return true;
-
- return false;
+ return ( $registration == 'all' || $registration == 'user' );
}
-add_filter('option_users_can_register', 'users_can_register_signup_filter');
/**
* Ensure that the welcome message is not empty. Currently unused.
@@ -2082,7 +2135,9 @@ add_filter('option_users_can_register', 'users_can_register_signup_filter');
function welcome_user_msg_filter( $text ) {
if ( !$text ) {
remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
- $text = __( 'Dear User,
+
+ /* translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: those are placeholders. */
+ $text = __( 'Howdy USERNAME,
Your new account is set up.
@@ -2098,18 +2153,19 @@ Thanks!
}
return $text;
}
-add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
/**
* Whether to force SSL on content.
*
* @since 2.8.5
*
- * @param string|bool $force
+ * @staticvar bool $forced_content
+ *
+ * @param bool $force
* @return bool True if forced, false if not forced.
*/
function force_ssl_content( $force = '' ) {
- static $forced_content;
+ static $forced_content = false;
if ( '' != $force ) {
$old_forced = $forced_content;
@@ -2212,6 +2268,8 @@ function wp_maybe_update_network_user_counts() {
* Update the network-wide site count.
*
* @since 3.7.0
+ *
+ * @global wpdb $wpdb
*/
function wp_update_network_site_counts() {
global $wpdb;
@@ -2224,6 +2282,8 @@ function wp_update_network_site_counts() {
* Update the network-wide user count.
*
* @since 3.7.0
+ *
+ * @global wpdb $wpdb
*/
function wp_update_network_user_counts() {
global $wpdb;
@@ -2364,6 +2424,8 @@ function wp_is_large_network( $using = 'sites' ) {
*
* @since 3.7.0
*
+ * @global wpdb $wpdb
+ *
* @param array $args {
* Array of default arguments. Optional.
*