Changes from trunk/wp-admin/includes/file.php at r12310 to branches/2.9/wp-admin/includes/file.php at r12545

File:

• branches/2.9/wp-admin/includes/file.php (modified) (2 diffs)

branches/2.9/wp-admin/includes/file.php

@@ -236 +236 @@
 
         // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file.  Handle that gracefully.
-        if ( isset( $file['error'] ) && !ctype_digit( $file['error'] ) && $file['error'] )
+        if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] )
                 return $upload_error_handler( $file, $file['error'] );
 
@@ -459 +459 @@
                 return new WP_Error('http_no_file', __('Could not create Temporary file'));
 
-        $response = wp_remote_get($url, array('timeout' => 60));
+        $response = wp_remote_get($url, array('timeout' => 300));
 
         if ( is_wp_error($response) ) {