Changeset 28782

Timestamp:

06/19/2014 11:20:15 PM (12 years ago)

Author:

johnbillion

Message:

Increase the timeout for plugin and theme update checks based on how many are being checked. Props dd32. Fixes #25788

File:

• trunk/src/wp-includes/update.php (modified) (2 diffs)

trunk/src/wp-includes/update.php

@@ -265 +265 @@
         $locales = apply_filters( 'plugins_update_check_locales', $locales );
 
+        if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+                $timeout = 30;
+        } elseif ( count( $plugins ) > 10 ) {
+                // One extra second for every 10 plugins
+                $timeout = 3 + intval( count( $plugins ) / 10 );
+        } else {
+                $timeout = 3;
+        }
+
         $options = array(
-                'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
+                'timeout' => $timeout,
                 'body' => array(
                         'plugins'      => json_encode( $to_send ),
@@ -413 +422 @@
         $locales = apply_filters( 'themes_update_check_locales', $locales );
 
+        if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+                $timeout = 30;
+        } elseif ( count( $themes ) > 10 ) {
+                // One extra second for every 10 themes
+                $timeout = 3 + intval( count( $themes ) / 10 );
+        } else {
+                $timeout = 3;
+        }
+
         $options = array(
-                'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
+                'timeout' => $timeout,
                 'body' => array(
                         'themes'       => json_encode( $request ),