Ticket #1324: wp_remote_fopen.2.diff

xmlrpc.php

@@ -1186 +1186 @@
                         $context = str_replace('&', '&', $context);
                 }
                                         
-                fclose($fp);
-
                 if (empty($context)) {
                         // URL pattern not found
                         return new IXR_Error(17, 'The source URI does not contain a link to the target URI, and so cannot be used as a source.');

wp-includes/functions.php

@@ -1859 +1859 @@
 }
 
 function wp_remote_fopen( $uri ) {
-        if ( function_exists('curl_init') ) {
+        if ( ini_get('allow_url_fopen') ) {
+                $fp = fopen( $uri, 'r' );
+                if ( !$fp )
+                        return false;
+                $linea = '';
+                while( $remote_read = fread($fp, 4096) )
+                        $linea .= $remote_read;
+                fclose($fp);
+                return $linea;          
+        } else if ( function_exists('curl_init') ) {
                 $handle = curl_init();
                 curl_setopt ($handle, CURLOPT_URL, $uri);
                 curl_setopt ($handle, CURLOPT_CONNECTTIMEOUT, 1);
@@ -1868 +1877 @@
                 curl_close($handle);
                 return $buffer;
         } else {
-                $fp = fopen( $uri, 'r' );
-                if ( !$fp )
-                        return false;
-                $linea = '';
-                while( $remote_read = fread($fp, 4096) )
-                        $linea .= $remote_read;
-                return $linea;
+                return false;
         }       
 }