Changeset 10221

Timestamp:

12/18/2008 05:23:20 PM (16 years ago)

Author:

ryan

Message:

Plugin and theme udpdate check fixes. Props DD32. fixes #8660 for trunk

File:

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

trunk/wp-includes/update.php

@@ -51 +51 @@
 
     $options = array('timeout' => 3);
-    $options['headers'] = array(
-        'Content-Type' => 'application/x-www-form-urlencoded; charset=' . get_option('blog_charset'),
-        'User-Agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo('url')
-    );
-
-    $response = wp_remote_request($url, $options);
+
+    $response = wp_remote_get($url, $options);
 
     if ( is_wp_error( $response ) )
@@ -119 +115 @@
         $current = new stdClass;
 
-    $new_option = '';
+    $new_option = new stdClass;
     $new_option->last_checked = time();
-    $time_not_changed = isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked );
+    $timeout = 'load-plugins.php' == current_filter() ? 360 : 43200; //Check for updated every 60 minutes if hitting the themes page, Else, check every 12 hours
+    $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
 
     $plugin_changed = false;
@@ -127 +124 @@
         $new_option->checked[ $file ] = $p['Version'];
 
-        if ( !isset( $current->checked[ $file ] ) ) {
-            $plugin_changed = true;
-            continue;
-        }
-
-        if ( strval($current->checked[ $file ]) !== strval($p['Version']) )
+        if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) )
             $plugin_changed = true;
     }
@@ -140 +132 @@
             if ( ! isset($plugins[ $plugin_file ]) ) {
                 $plugin_changed = true;
+                break;
             }
         }
@@ -152 +145 @@
     update_option( 'update_plugins', $current );
 
-    $to_send->plugins = $plugins;
-    $to_send->active = $active;
-    $send = serialize( $to_send );
-    $body = 'plugins=' . urlencode( $send );
-
-    $options = array('method' => 'POST', 'timeout' => 3, 'body' => $body);
-    $options['headers'] = array(
-        'Content-Type' => 'application/x-www-form-urlencoded; charset=' . get_option('blog_charset'),
-        'Content-Length' => strlen($body),
-        'User-Agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo('url')
-    );
-
-    $raw_response = wp_remote_request('http://api.wordpress.org/plugins/update-check/1.0/', $options);
+    $to_send = (object)compact('plugins', 'active');
+    $body = array('plugins' => serialize( $to_send ) );
+
+    $options = array('timeout' => 3, 'body' => $body);
+
+    $raw_response = wp_remote_post('http://api.wordpress.org/plugins/update-check/1.0/', $options);
 
     if ( is_wp_error( $raw_response ) )
         return false;
 
-    if( 200 != $raw_response['response']['code'] ) {
-        return false;
-    }
+    if( 200 != $raw_response['response']['code'] )
+        return false;
 
     $response = unserialize( $raw_response['body'] );
@@ -210 +195 @@
         $current_theme = new stdClass;
 
-    $new_option = '';
+    $new_option = new stdClass;
     $new_option->last_checked = time( );
-    $time_not_changed = isset( $current_theme->last_checked ) && 43200 > ( time( ) - $current_theme->last_checked );
+    $timeout = 'load-themes.php' == current_filter() ? 360 : 43200; //Check for updated every 60 minutes if hitting the themes page, Else, check every 12 hours
+    $time_not_changed = isset( $current_theme->last_checked ) && $timeout > ( time( ) - $current_theme->last_checked );
 
     if( $time_not_changed )
@@ -232 +218 @@
 
     $options = array(
-        'method'        => 'POST',
         'timeout'       => 3,
-        'body'          => 'themes=' . urlencode( serialize( $themes ) )
+        'body'          => array( 'themes' => serialize( $themes ) )
     );
-    $options['headers'] = array(
-        'Content-Type'      => 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' ),
-        'Content-Length'    => strlen( $options['body'] ),
-        'User-Agent'        => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
-    );
-
-    $raw_response = wp_remote_request( 'http://api.wordpress.org/themes/update-check/1.0/', $options );
+
+    $raw_response = wp_remote_post( 'http://api.wordpress.org/themes/update-check/1.0/', $options );
 
     if( is_wp_error( $raw_response ) )
@@ -296 +276 @@
 add_action( 'wp_update_plugins', 'wp_update_plugins' );
 
+add_action( 'load-themes.php', 'wp_update_themes' );
+add_action( 'load-update.php', 'wp_update_themes' );
 add_action( 'admin_init', '_maybe_update_themes' );
 add_action( 'wp_update_themes', 'wp_update_themes' );