Merge branch 'WordPress:trunk' into permalinks-settings-ltr

Author: sabernhardt

src/wp-admin/css/forms.css

@@ -1085,7 +1085,6 @@ table.form-table td .updated p {
 
 .form-table.permalink-structure .structure-selection .row > div {
 	max-width: calc(100% - 24px);
-	margin-left: 4px;
 	display: inline-flex;
 	flex-direction: column;
 }

src/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -40,7 +40,7 @@ public function __construct( $opt = '' ) {
 
 		// 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'] ) ) {

src/wp-admin/includes/file.php

@@ -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() ) {

src/wp-admin/options.php

@@ -344,7 +344,8 @@
 	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() );