Changeset 7547 for trunk/wp-admin/includes/file.php

Timestamp:

03/27/2008 07:36:30 AM (17 years ago)

Author:

ryan

Message:

Return WP_Error from download_url() on HTTP Errors. Fix cases where current plugin filename differs from the WordPress.org slug. Props DD32. see #5586

File:

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

trunk/wp-admin/includes/file.php

@@ -193 +193 @@
 *
 * @param string $url the URL of the file to download
-* @return mixed false on failure, string Filename on success.
+* @return mixed WP_Error on failure, string Filename on success.
 */
 function download_url( $url ) {
     //WARNING: The file is not automatically deleted, The script must unlink() the file.
     if( ! $url )
-        return false;
+        return new WP_Error('http_no_url', __('Invalid URL Provided'));
 
     $tmpfname = tempnam(get_temp_dir(), 'wpupdate');
     if( ! $tmpfname )
-        return false;
+        return new WP_Error('http_no_file', __('Could not create Temporary file'));
 
     $handle = @fopen($tmpfname, 'w');
     if( ! $handle )
-        return false;
+        return new WP_Error('http_no_file', __('Could not create Temporary file'));
 
     require_once( ABSPATH . 'wp-includes/class-snoopy.php' );
@@ -212 +212 @@
     $snoopy->fetch($url);
 
+    if( $snoopy->status != '200' ){
+        fclose($handle);
+        unlink($tmpfname);
+        return new WP_Error('http_404', trim($snoopy->response_code));
+    }
     fwrite($handle, $snoopy->results);
     fclose($handle);