brianhansonxyz/homeproz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Hanson.xyz Dev
2026-01-04 17:50:08 -06:00
parent 7e45ce0756
commit acc8ac87a0
4131 changed files with 232562 additions and 250244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/ms-functions.php
+18 -17
View File
@@ -570,7 +570,7 @@ function wpmu_validate_user_signup( $user_name, $user_email ) {
if ( $diff > 2 * DAY_IN_SECONDS ) {
$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
} else {
$errors->add( 'user_email', __( 'That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.' ) );
$errors->add( 'user_email', __( 'That email address is pending activation and is not available for new registration. If you made a previous attempt with this email address, please check your inbox for an activation email. If left unconfirmed, it will become available in a couple of days.' ) );
}
}
@@ -730,7 +730,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
* unless it's the user's own username.
*/
if ( username_exists( $blogname ) ) {
if ( ! is_object( $user ) || ( is_object( $user ) && $user->user_login !== $blogname ) ) {
if ( ! $user instanceof WP_User || $user->user_login !== $blogname ) {
$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
}
}
@@ -2420,15 +2420,15 @@ Thanks!
*
* @since 2.8.5
*
* @param bool $force
* @param bool|null $force Optional. Whether to force SSL in admin screens. Default null.
* @return bool True if forced, false if not forced.
*/
function force_ssl_content( $force = '' ) {
function force_ssl_content( $force = null ) {
static $forced_content = false;
if ( ! $force ) {
if ( ! is_null( $force ) ) {
$old_forced = $forced_content;
$forced_content = $force;
$forced_content = (bool) $force;
return $old_forced;
}
@@ -2816,11 +2816,12 @@ All at ###SITENAME###
* Filters the text of the email sent when a change of network admin email address is attempted.
*
* The following strings have a special meaning and will get replaced dynamically:
* ###USERNAME### The current user's username.
* ###ADMIN_URL### The link to click on to confirm the email change.
* ###EMAIL### The proposed new network admin email address.
* ###SITENAME### The name of the network.
* ###SITEURL### The URL to the network.
*
* - `###USERNAME###` The current user's username.
* - `###ADMIN_URL###` The link to click on to confirm the email change.
* - `###EMAIL###` The proposed new network admin email address.
* - `###SITENAME###` The name of the network.
* - `###SITEURL###` The URL to the network.
*
* @since 4.9.0
*
@@ -2869,8 +2870,8 @@ All at ###SITENAME###
function wp_network_admin_email_change_notification( $option_name, $new_email, $old_email, $network_id ) {
$send = true;
// Don't send the notification to the default 'admin_email' value.
if ( 'you@example.com' === $old_email ) {
// Don't send the notification for an empty email address or the default 'admin_email' value.
if ( empty( $old_email ) || 'you@example.com' === $old_email ) {
$send = false;
}
@@ -2927,10 +2928,10 @@ All at ###SITENAME###
* @type string $subject The subject of the email.
* @type string $message The content of the email.
* The following strings have a special meaning and will get replaced dynamically:
* - ###OLD_EMAIL### The old network admin email address.
* - ###NEW_EMAIL### The new network admin email address.
* - ###SITENAME### The name of the network.
* - ###SITEURL### The URL to the site.
* - `###OLD_EMAIL###` The old network admin email address.
* - `###NEW_EMAIL###` The new network admin email address.
* - `###SITENAME###` The name of the network.
* - `###SITEURL###` The URL to the site.
* @type string $headers Headers.
* }
* @param string $old_email The old network admin email address.