Ticket #22704: 22704.5.diff

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

@@ -1343 +1343 @@
                 if ( $offered_ver == $wp_version )
                         return false;
 
+                // Check to see if we've failed to update once before
+                if ( get_site_option( 'update_failed_' . $offered_ver ) )
+                        return false;
+
                 // 2: If we're running a newer version, that's a nope
                 if ( version_compare( $wp_version, $offered_ver, '>' ) )
                         return false;
@@ -1737 +1741 @@
                                 $rollback_data = $core_update_result->get_error_data();
                                 $extra_update_stats['success'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_code() : $rollback_data['update'];
                                 $extra_update_stats['rollback'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_code() : $rollback_data['rollback'];
+
+                                // Set a flag to say we don't want to attempt to upgrade to that version again
+                                set_site_option( 'update_failed_' . $core_update->version, true );
                         }
                         $extra_update_stats['fs_method'] = $GLOBALS['wp_filesystem']->method;
                         $extra_update_stats['time_taken'] = ( time() - $start_time );