WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-23 23:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Login and Registration: Declare globals at the top of wp_signon() for consistency.

Browse Source 
Follow-up to [10437], [32637], [58333].

See #58901.
Built from https://develop.svn.wordpress.org/trunk@58341


git-svn-id: http://core.svn.wordpress.org/trunk@57797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-06-05 12:23:10 +00:00
parent 4957cdaa0e
commit 11d6ed3dc8
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/user.php
View File

@ -25,6 +25,7 @@
* @since 2.5.0 * @since 2.5.0
* *
* @global string $auth_secure_cookie * @global string $auth_secure_cookie
* @global wpdb $wpdb WordPress database abstraction object.
* *
* @param array $credentials { * @param array $credentials {
* Optional. User info in order to sign on. * Optional. User info in order to sign on.
@ -38,6 +39,8 @@
* @return WP_User|WP_Error WP_User on success, WP_Error on failure. * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
*/ */
function wp_signon( $credentials = array(), $secure_cookie = '' ) { function wp_signon( $credentials = array(), $secure_cookie = '' ) {
global $auth_secure_cookie, $wpdb;
if ( empty( $credentials ) ) { if ( empty( $credentials ) ) {
$credentials = array( $credentials = array(
'user_login' => '', 'user_login' => '',
@ -98,7 +101,7 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
*/ */
$secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials ); $secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );
global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie(). // XXX ugly hack to pass this to wp_authenticate_cookie().
$auth_secure_cookie = $secure_cookie; $auth_secure_cookie = $secure_cookie;
add_filter( 'authenticate', 'wp_authenticate_cookie', 30, 3 ); add_filter( 'authenticate', 'wp_authenticate_cookie', 30, 3 );
@ -111,24 +114,16 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
wp_set_auth_cookie( $user->ID, $credentials['remember'], $secure_cookie ); wp_set_auth_cookie( $user->ID, $credentials['remember'], $secure_cookie );
/** // Clear `user_activation_key` after a successful login.
* @global wpdb $wpdb WordPress database abstraction object.
*/
global $wpdb;
// Flush `user_activation_key` if exists after successful login.
if ( ! empty( $user->user_activation_key ) ) { if ( ! empty( $user->user_activation_key ) ) {
$wpdb->update( $wpdb->update(
$wpdb->users, $wpdb->users,
array( array(
'user_activation_key' => '', 'user_activation_key' => '',
), ),
array( 'ID' => $user->ID ), array( 'ID' => $user->ID )
array( '%s' ),
array( '%d' )
); );
// Empty user_activation_key object.
$user->user_activation_key = ''; $user->user_activation_key = '';
} }
@ -141,6 +136,7 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
* @param WP_User $user WP_User object of the logged-in user. * @param WP_User $user WP_User object of the logged-in user.
*/ */
do_action( 'wp_login', $user->user_login, $user ); do_action( 'wp_login', $user->user_login, $user );
return $user; return $user;
} }
@ -306,6 +302,8 @@ function wp_authenticate_email_password( $user, $email, $password ) {
* @return WP_User|WP_Error WP_User on success, WP_Error on failure. * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
*/ */
function wp_authenticate_cookie( $user, $username, $password ) { function wp_authenticate_cookie( $user, $username, $password ) {
global $auth_secure_cookie;
if ( $user instanceof WP_User ) { if ( $user instanceof WP_User ) {
return $user; return $user;
} }
@ -316,8 +314,6 @@ function wp_authenticate_cookie( $user, $username, $password ) {
return new WP_User( $user_id ); return new WP_User( $user_id );
} }
global $auth_secure_cookie;
if ( $auth_secure_cookie ) { if ( $auth_secure_cookie ) {
$auth_cookie = SECURE_AUTH_COOKIE; $auth_cookie = SECURE_AUTH_COOKIE;
} else { } else {

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.6-beta1-58340'; $wp_version = '6.6-beta1-58341';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.