Changeset 2606

Timestamp:

05/13/2005 09:53:18 PM (20 years ago)

Author:

matt

Message:

fclose removed, only use curl if we have to - ​http://mosquito.wordpress.org/view.php?id=1324 - hat tip: rboren

Location:

trunk

Files:

• wp-includes/functions.php (modified) (2 diffs)
• xmlrpc.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1860 +1860 @@
 
 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);
@@ -1869 +1878 @@
         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;
     }   
 }

trunk/xmlrpc.php

@@ -1186 +1186 @@
             $context = str_replace('&', '&', $context);
         }
-                    
-        fclose($fp);
 
         if (empty($context)) {