diff --git a/src/license.txt b/src/license.txt index 90cf5383fe5a4..a22eda8f3bbf4 100644 --- a/src/license.txt +++ b/src/license.txt @@ -1,6 +1,6 @@ WordPress - Web publishing software -Copyright 2011-2024 by the contributors +Copyright 2011-2025 by the contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/wp-content/themes/twentyeleven/readme.txt b/src/wp-content/themes/twentyeleven/readme.txt index 16d4d11e26b57..f8d794b9b8a23 100644 --- a/src/wp-content/themes/twentyeleven/readme.txt +++ b/src/wp-content/themes/twentyeleven/readme.txt @@ -23,7 +23,7 @@ For more information about Twenty Eleven please go to https://codex.wordpress.or == Copyright == -Twenty Eleven WordPress Theme, Copyright 2011-2024 WordPress.org, Automattic Inc., and contributors. +Twenty Eleven WordPress Theme, Copyright 2011-2025 WordPress.org, Automattic Inc., and contributors. Twenty Eleven is Distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentyfifteen/readme.txt b/src/wp-content/themes/twentyfifteen/readme.txt index 358101e7a55af..2fd9ff16029ad 100644 --- a/src/wp-content/themes/twentyfifteen/readme.txt +++ b/src/wp-content/themes/twentyfifteen/readme.txt @@ -31,7 +31,7 @@ For more information about Twenty Fifteen please go to https://wordpress.org/doc == Copyright == -Twenty Fifteen WordPress Theme, Copyright 2014-2024 WordPress.org, Automattic Inc., and contributors. +Twenty Fifteen WordPress Theme, Copyright 2014-2025 WordPress.org, Automattic Inc., and contributors. Twenty Fifteen is distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentyfourteen/readme.txt b/src/wp-content/themes/twentyfourteen/readme.txt index a54226a83f7fb..af119167596ea 100644 --- a/src/wp-content/themes/twentyfourteen/readme.txt +++ b/src/wp-content/themes/twentyfourteen/readme.txt @@ -23,7 +23,7 @@ For more information about Twenty Fourteen please go to https://codex.wordpress. == Copyright == -Twenty Fourteen WordPress Theme, Copyright 2013-2024 WordPress.org, Automattic Inc., and contributors. +Twenty Fourteen WordPress Theme, Copyright 2013-2025 WordPress.org, Automattic Inc., and contributors. Twenty Fourteen is Distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentynineteen/readme.txt b/src/wp-content/themes/twentynineteen/readme.txt index d3ca13553e2d1..e30e9291c221d 100644 --- a/src/wp-content/themes/twentynineteen/readme.txt +++ b/src/wp-content/themes/twentynineteen/readme.txt @@ -25,7 +25,7 @@ For more information about Twenty Nineteen please go to https://wordpress.org/do == Copyright == -Twenty Nineteen WordPress Theme, Copyright 2018-2024 WordPress.org, and contributors. +Twenty Nineteen WordPress Theme, Copyright 2018-2025 WordPress.org, and contributors. Twenty Nineteen is distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify @@ -147,7 +147,7 @@ Initial release == Resources == * normalize.css, © 2012-2018 Nicolas Gallagher and Jonathan Neal, MIT -* Underscores, © 2012-2024 Automattic, Inc., GNU GPL v2 or later +* Underscores, © 2012-2025 Automattic, Inc., GNU GPL v2 or later * Bundled block pattern images: * Abstract Background by HD Wallpapers, CC0. https://stocksnap.io/photo/abstract-background-0SRRVNMKBX * Abstract Waves by HD Wallpapers, CC0. https://stocksnap.io/photo/abstract-waves-0KREGLTZQ3 diff --git a/src/wp-content/themes/twentyseventeen/readme.txt b/src/wp-content/themes/twentyseventeen/readme.txt index c78ed84d89e3a..cc3246ea4d8e3 100644 --- a/src/wp-content/themes/twentyseventeen/readme.txt +++ b/src/wp-content/themes/twentyseventeen/readme.txt @@ -24,7 +24,7 @@ For more information about Twenty Seventeen please go to https://wordpress.org/d == Copyright == -Twenty Seventeen WordPress Theme, Copyright 2016-2024 WordPress.org, and contributors. +Twenty Seventeen WordPress Theme, Copyright 2016-2025 WordPress.org, and contributors. Twenty Seventeen is distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentysixteen/readme.txt b/src/wp-content/themes/twentysixteen/readme.txt index 6891502fe3b5e..e5a5a2776773d 100644 --- a/src/wp-content/themes/twentysixteen/readme.txt +++ b/src/wp-content/themes/twentysixteen/readme.txt @@ -30,7 +30,7 @@ For more information about Twenty Sixteen please go to https://wordpress.org/doc == Copyright == -Twenty Sixteen WordPress Theme, Copyright 2014-2024 WordPress.org, and contributors. +Twenty Sixteen WordPress Theme, Copyright 2014-2025 WordPress.org, and contributors. Twenty Sixteen is distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentyten/readme.txt b/src/wp-content/themes/twentyten/readme.txt index 1127216542e5d..f0e8c057cfb64 100644 --- a/src/wp-content/themes/twentyten/readme.txt +++ b/src/wp-content/themes/twentyten/readme.txt @@ -23,7 +23,7 @@ For more information about Twenty Ten theme please go to https://codex.wordpress == Copyright == -Twenty Ten WordPress Theme, Copyright 2010-2024 WordPress.org, Automattic Inc., and contributors. +Twenty Ten WordPress Theme, Copyright 2010-2025 WordPress.org, Automattic Inc., and contributors. Twenty Ten is Distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentythirteen/readme.txt b/src/wp-content/themes/twentythirteen/readme.txt index e02e6eae1cc07..94261e7c4c002 100644 --- a/src/wp-content/themes/twentythirteen/readme.txt +++ b/src/wp-content/themes/twentythirteen/readme.txt @@ -23,7 +23,7 @@ For more information about Twenty Thirteen please go to https://codex.wordpress. == Copyright == -Twenty Thirteen WordPress Theme, Copyright 2013-2024 WordPress.org, Automattic Inc., and contributors. +Twenty Thirteen WordPress Theme, Copyright 2013-2025 WordPress.org, Automattic Inc., and contributors. Twenty Thirteen is Distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentytwelve/readme.txt b/src/wp-content/themes/twentytwelve/readme.txt index 3e716ee1b4ab7..f746e9add5048 100644 --- a/src/wp-content/themes/twentytwelve/readme.txt +++ b/src/wp-content/themes/twentytwelve/readme.txt @@ -23,7 +23,7 @@ For more information about Twenty Twelve please go to https://codex.wordpress.or == Copyright == -Twenty Twelve WordPress Theme, Copyright 2012-2024 WordPress.org, Automattic Inc., and contributors. +Twenty Twelve WordPress Theme, Copyright 2012-2025 WordPress.org, Automattic Inc., and contributors. Twenty Twelve is Distributed under the terms of the GNU GPL This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentytwenty/readme.txt b/src/wp-content/themes/twentytwenty/readme.txt index 293baaef7c382..cd5d4b01d62c3 100644 --- a/src/wp-content/themes/twentytwenty/readme.txt +++ b/src/wp-content/themes/twentytwenty/readme.txt @@ -121,7 +121,7 @@ Initial release == Copyright == -Twenty Twenty WordPress Theme, Copyright 2019-2024 WordPress.org and contributors. +Twenty Twenty WordPress Theme, Copyright 2019-2025 WordPress.org and contributors. Twenty Twenty is distributed under the terms of the GNU GPL. This program is free software: you can redistribute it and/or modify @@ -170,7 +170,7 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html Source: WordPress Social Link Block (See wp-includes\blocks\social-link.php) Code from Twenty Nineteen -Copyright (c) 2018-2024 WordPress.org +Copyright (c) 2018-2025 WordPress.org License: GPLv2 Source: https://wordpress.org/themes/twentynineteen/ Included as part of the following classes and functions: @@ -180,11 +180,11 @@ Included as part of the following classes and functions: - twentytwenty_nav_menu_social_icons() Code from Twenty Seventeen -Copyright (c) 2016-2024 WordPress.org +Copyright (c) 2016-2025 WordPress.org License: GPLv2 Source: https://wordpress.org/themes/twentyseventeen/ Included as part of the following classes and functions: - twentytwenty_unique_id() Underscores -https://underscores.me/, (C) 2012-2024 Automattic, Inc., [GPLv2 or later](https://www.gnu.org/licenses/gpl-2.0.html) +https://underscores.me/, (C) 2012-2025 Automattic, Inc., [GPLv2 or later](https://www.gnu.org/licenses/gpl-2.0.html) diff --git a/src/wp-content/themes/twentytwentyfive/readme.txt b/src/wp-content/themes/twentytwentyfive/readme.txt index c04796c2e7343..b4dc89e9c9fe6 100644 --- a/src/wp-content/themes/twentytwentyfive/readme.txt +++ b/src/wp-content/themes/twentytwentyfive/readme.txt @@ -17,7 +17,7 @@ Twenty Twenty-Five emphasizes simplicity and adaptability. It offers flexible de == Copyright == -Twenty Twenty-Five WordPress Theme, (C) 2024 WordPress.org and contributors. +Twenty Twenty-Five WordPress Theme, (C) 2024-2025 WordPress.org and contributors. Twenty Twenty-Five is distributed under the terms of the GNU GPL. This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentytwentyfour/readme.txt b/src/wp-content/themes/twentytwentyfour/readme.txt index 8008a10b2fd9b..299a63d4c997c 100644 --- a/src/wp-content/themes/twentytwentyfour/readme.txt +++ b/src/wp-content/themes/twentytwentyfour/readme.txt @@ -35,7 +35,7 @@ https://wordpress.org/documentation/article/twenty-twenty-four-changelog/#Versio == Copyright == -Twenty Twenty-Four WordPress Theme, (C) 2023-2024 WordPress.org and contributors. +Twenty Twenty-Four WordPress Theme, (C) 2023-2025 WordPress.org and contributors. Twenty Twenty-Four is distributed under the terms of the GNU GPL. This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentytwentyone/readme.txt b/src/wp-content/themes/twentytwentyone/readme.txt index e0c9e6949c2d5..b955225ca6a83 100644 --- a/src/wp-content/themes/twentytwentyone/readme.txt +++ b/src/wp-content/themes/twentytwentyone/readme.txt @@ -107,7 +107,7 @@ https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version == Copyright == -Twenty Twenty-One WordPress Theme, 2020-2024 WordPress.org and contributors. +Twenty Twenty-One WordPress Theme, 2020-2025 WordPress.org and contributors. Twenty Twenty-One is distributed under the terms of the GNU GPL. This program is free software: you can redistribute it and/or modify @@ -125,19 +125,19 @@ Twenty Twenty-One is derived from Seedlet, (C) 2020 Automattic, Inc. Twenty Twenty-One is also based on: -Twenty Nineteen. 2018-2024 WordPress.org +Twenty Nineteen. 2018-2025 WordPress.org Twenty Nineteen is distributed under the terms of the GNU GPL v2 or later. -Twenty Seventeen. Copyright (C) 2016-2024 WordPress.org +Twenty Seventeen. Copyright (C) 2016-2025 WordPress.org Twenty Seventeen is distributed under the terms of the GNU GPL v2 or later. -Twenty Sixteen. Copyright (C) 2015-2024 WordPress.org +Twenty Sixteen. Copyright (C) 2015-2025 WordPress.org Twenty Sixteen is distributed under the terms of the GNU GPL v2 or later. -Twenty Twenty. Copyright (C) 2020-2024 WordPress.org +Twenty Twenty. Copyright (C) 2020-2025 WordPress.org Twenty Twenty is distributed under the terms of the GNU GPL v2 or later. -Underscores https://underscores.me/, Copyright (C) 2012-2024 Automattic, Inc. +Underscores https://underscores.me/, Copyright (C) 2012-2025 Automattic, Inc. Underscores is distributed under the terms of the GNU GPL v2 or later. Normalizing styles have been helped along thanks to the fine work of diff --git a/src/wp-content/themes/twentytwentythree/readme.txt b/src/wp-content/themes/twentytwentythree/readme.txt index 237758249f85d..9e4653b7f4ec4 100644 --- a/src/wp-content/themes/twentytwentythree/readme.txt +++ b/src/wp-content/themes/twentytwentythree/readme.txt @@ -52,7 +52,7 @@ https://wordpress.org/documentation/article/twenty-twenty-three-changelog/#Versi == Copyright == -Twenty Twenty-Three WordPress Theme, (C) 2022-2024 WordPress.org and contributors. +Twenty Twenty-Three WordPress Theme, (C) 2022-2025 WordPress.org and contributors. Twenty Twenty-Three is distributed under the terms of the GNU GPL. This program is free software: you can redistribute it and/or modify diff --git a/src/wp-content/themes/twentytwentytwo/readme.txt b/src/wp-content/themes/twentytwentytwo/readme.txt index d2635dbfe0207..ace8251b15899 100644 --- a/src/wp-content/themes/twentytwentytwo/readme.txt +++ b/src/wp-content/themes/twentytwentytwo/readme.txt @@ -91,7 +91,7 @@ https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version == Copyright == -Twenty Twenty-Two WordPress Theme, 2021-2024 WordPress.org and contributors. +Twenty Twenty-Two WordPress Theme, 2021-2025 WordPress.org and contributors. Twenty Twenty-Two is distributed under the terms of the GNU GPL. This program is free software: you can redistribute it and/or modify diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php index 263d7716af6eb..97d2f9102c30c 100644 --- a/src/wp-includes/ms-functions.php +++ b/src/wp-includes/ms-functions.php @@ -481,10 +481,12 @@ function wpmu_validate_user_signup( $user_name, $user_email ) { } $illegal_names = get_site_option( 'illegal_names' ); + 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 ) ) { $errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) ); } @@ -516,10 +518,12 @@ function wpmu_validate_user_signup( $user_name, $user_email ) { } $limited_email_domains = get_site_option( 'limited_email_domains' ); + if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) { $limited_email_domains = array_map( 'strtolower', $limited_email_domains ); - $emaildomain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) ); - if ( ! in_array( $emaildomain, $limited_email_domains, true ) ) { + $email_domain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) ); + + if ( ! in_array( $email_domain, $limited_email_domains, true ) ) { $errors->add( 'user_email', __( 'Sorry, that email address is not allowed!' ) ); } } @@ -637,7 +641,8 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { $errors = new WP_Error(); $illegal_names = get_site_option( 'illegal_names' ); - if ( empty( $illegal_names ) ) { + + if ( ! is_array( $illegal_names ) ) { $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ); add_site_option( 'illegal_names', $illegal_names ); } @@ -721,7 +726,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 ( ! is_object( $user ) || ( is_object( $user ) && $user->user_login !== $blogname ) ) { $errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) ); } } @@ -1626,8 +1631,8 @@ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta $switched_locale = switch_to_user_locale( $user_id ); - $welcome_email = (string) get_site_option( 'welcome_email' ); - if ( '' === $welcome_email ) { + $welcome_email = get_site_option( 'welcome_email' ); + /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */ $welcome_email = __( 'Howdy USERNAME,