Ticket #46292: 46292.diff

src/wp-admin/includes/class-core-upgrader.php

@@ -115 +115 @@
                         $to_download = 'full';
                 }
 
+                set_time_limit( 5 * MINUTE_IN_SECONDS );
+
                 // Lock to prevent multiple Core Updates occurring.
                 $lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );
                 if ( ! $lock ) {

src/wp-admin/includes/class-wp-upgrader.php

@@ -470 +470 @@
                 $destination       = $args['destination'];
                 $clear_destination = $args['clear_destination'];
 
-                set_time_limit( 300 );
-
                 if ( empty( $source ) || empty( $destination ) ) {
                         return new WP_Error( 'bad_request', $this->strings['bad_request'] );
                 }
@@ -754 +752 @@
                         return $res;
                 }
 
+                set_time_limit( 5 * MINUTE_IN_SECONDS );
+
                 /*
                  * Download the package. Note: If the package is the full path
                  * to an existing local file, it will be returned untouched.

src/wp-admin/includes/update-core.php

@@ -962 +962 @@
 function update_core( $from, $to ) {
         global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb;
 
-        set_time_limit( 300 );
-
         /**
          * Filters feedback messages displayed during the core update process.
          *