Changeset 8545

Timestamp:

08/05/2008 05:45:34 AM (17 years ago)

Author:

ryan

Message:

Suppress fopen errors if WP_DEBUG is not enabled. Props jacobsantos. fixes #7456 see #4779

File:

• trunk/wp-includes/http.php (modified) (3 diffs)

trunk/wp-includes/http.php

@@ -543 +543 @@
         $arrURL = parse_url($url);
 
+        if ( false === $arrURL )
+            return new WP_Error('http_request_failed', sprintf(__('Malformed URL: %s'), $url));
+
         if ( 'http' != $arrURL['scheme'] || 'https' != $arrURL['scheme'] )
             $url = str_replace($arrURL['scheme'], 'http', $url);
 
-        $handle = fopen($url, 'r');
+        if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+            $handle = @fopen($url, 'r');
+        else
+            $handle = fopen($url, 'r');
 
         if (! $handle)
@@ -637 +643 @@
 
         $arrURL = parse_url($url);
+
+        if ( false === $arrURL )
+            return new WP_Error('http_request_failed', sprintf(__('Malformed URL: %s'), $url));
 
         if ( 'http' != $arrURL['scheme'] || 'https' != $arrURL['scheme'] )
@@ -657 +666 @@
         $context = stream_context_create($arrContext);
 
-        $handle = fopen($url, 'r', false, $context);
+        if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+            $handle = @fopen($url, 'r');
+        else
+            $handle = fopen($url, 'r');
 
         if ( ! $handle)