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

Coding Standards: Use `MINUTE_IN_SECONDS` where appropriate. 

This aims to clarify the time units for some timeout or expiration values.

Follow-up to [11823], [13177], [21996], [37747].

See #55647.
Built from https://develop.svn.wordpress.org/trunk@53714


git-svn-id: http://core.svn.wordpress.org/trunk@53273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-07-17 02:18:09 +00:00
parent 0eff79af37
commit 4e0b801910
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/class-wp-filesystem-ftpext.php
View File

@ -40,7 +40,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
// This class uses the timeout on a per-connection basis, others use it on a per-action basis.
if ( ! defined( 'FS_TIMEOUT' ) ) {
define( 'FS_TIMEOUT', 240 );
define( 'FS_TIMEOUT', 4 * MINUTE_IN_SECONDS );
}
if ( empty( $opt['port'] ) ) {

4
wp-admin/includes/file.php
View File

@ -2007,10 +2007,10 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own
* to allow for per-transport overriding of the default.
*/
if ( ! defined( 'FS_CONNECT_TIMEOUT' ) ) {
define( 'FS_CONNECT_TIMEOUT', 30 );
define( 'FS_CONNECT_TIMEOUT', MINUTE_IN_SECONDS / 2 );
}
if ( ! defined( 'FS_TIMEOUT' ) ) {
define( 'FS_TIMEOUT', 30 );
define( 'FS_TIMEOUT', MINUTE_IN_SECONDS / 2 );
}
if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {

2
wp-admin/options-permalink.php
View File

@ -203,7 +203,7 @@ if ( $structure_updated ) {
add_settings_error( 'general', 'settings_updated', $message, 'success' );
}
set_transient( 'settings_errors', get_settings_errors(), 30 );
set_transient( 'settings_errors', get_settings_errors(), MINUTE_IN_SECONDS / 2 );
wp_redirect( admin_url( 'options-permalink.php?settings-updated=true' ) );
exit;

3
wp-admin/options.php
View File

@ -344,7 +344,8 @@ if ( 'update' === $action ) { // We are saving settings sent from a settings pag
if ( ! count( get_settings_errors() ) ) {
add_settings_error( 'general', 'settings_updated', __( 'Settings saved.' ), 'success' );
}
set_transient( 'settings_errors', get_settings_errors(), 30 );
set_transient( 'settings_errors', get_settings_errors(), MINUTE_IN_SECONDS / 2 );
// Redirect back to the settings page that was submitted.
$goback = add_query_arg( 'settings-updated', 'true', wp_get_referer() );

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.1-alpha-53713';
$wp_version = '6.1-alpha-53714';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.