Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bootstrap/Load: Set expiration of the recovery mode cookie to the same amount of time for which the token in it is valid: a week by default. 

Props david.binda, TimothyBlynJacobs.
Fixes #47480.
Built from https://develop.svn.wordpress.org/trunk@45545


git-svn-id: http://core.svn.wordpress.org/trunk@45356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-06-17 19:17:54 +00:00
parent 038c980a42
commit 55d05b56c3
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/class-wp-recovery-mode-cookie-service.php
View File

@ -35,10 +35,20 @@ final class WP_Recovery_Mode_Cookie_Service {
$value = $this->generate_cookie(); $value = $this->generate_cookie();
setcookie( RECOVERY_MODE_COOKIE, $value, 0, COOKIEPATH, COOKIE_DOMAIN, is_ssl(), true ); /**
* Filter the length of time a Recovery Mode cookie is valid for.
*
* @since 5.2.0
*
* @param int $length Length in seconds.
*/
$length = apply_filters( 'recovery_mode_cookie_length', WEEK_IN_SECONDS );
$expire = time() + $length;
setcookie( RECOVERY_MODE_COOKIE, $value, $expire, COOKIEPATH, COOKIE_DOMAIN, is_ssl(), true );
if ( COOKIEPATH !== SITECOOKIEPATH ) { if ( COOKIEPATH !== SITECOOKIEPATH ) {
setcookie( RECOVERY_MODE_COOKIE, $value, 0, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl(), true ); setcookie( RECOVERY_MODE_COOKIE, $value, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl(), true );
} }
} }
@ -83,13 +93,7 @@ final class WP_Recovery_Mode_Cookie_Service {
return new WP_Error( 'invalid_created_at', __( 'Invalid cookie format.' ) ); return new WP_Error( 'invalid_created_at', __( 'Invalid cookie format.' ) );
} }
/** /** This filter is documented in wp-includes/class-wp-recovery-mode-cookie-service.php */
* Filter the length of time a Recovery Mode cookie is valid for.
*
* @since 5.2.0
*
* @param int $length Length in seconds.
*/
$length = apply_filters( 'recovery_mode_cookie_length', WEEK_IN_SECONDS ); $length = apply_filters( 'recovery_mode_cookie_length', WEEK_IN_SECONDS );
if ( time() > $created_at + $length ) { if ( time() > $created_at + $length ) {

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45544'; $wp_version = '5.3-alpha-45545';
/** /**
* 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.