fclose removed, only use curl if we have to - http://mosquito.wordpre…

…ss.org/view.php?id=1324 - hat tip: rboren

git-svn-id: http://svn.automattic.com/wordpress/trunk@2606 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/functions.php

@@ -1859,7 +1859,16 @@ function add_magic_quotes($array) {
 }
 
 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,13 +1877,7 @@ function wp_remote_fopen( $uri ) {
 		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;
 	}	
 }
 

xmlrpc.php

@@ -1185,8 +1185,6 @@ function pingback_ping($args) {
 			$context = str_replace("\n", ' ', $context);
 			$context = str_replace('&', '&', $context);
 		}
-
-		fclose($fp);
 
 		if (empty($context)) {
 			// URL pattern not found