Changeset 14361

Timestamp:

05/03/2010 06:28:05 AM (16 years ago)

Author:

nacin

Message:

Prevent fatal error when falling back to fsockopen in the setup-config.php key/salt HTTP request. fixes #13030.

Location:

trunk

Files:

• wp-admin/setup-config.php (modified) (1 diff)
• wp-includes/class-http.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/setup-config.php

@@ -27 +27 @@
  * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
  */
-error_reporting(0);
+error_reporting(E_ALL &~ E_DEPRECATED);
 
 /**#@+

trunk/wp-includes/class-http.php

@@ -90 +90 @@
 
         if ( is_null($working_transport) ) {
-            if ( true === WP_Http_ExtHttp::test($args) ) {
+            /* if ( true === WP_Http_ExtHttp::test($args) ) {
                 $working_transport['exthttp'] = new WP_Http_ExtHttp();
                 $blocking_transport[] = &$working_transport['exthttp'];
@@ -102 +102 @@
                 $working_transport['fopen'] = new WP_Http_Fopen();
                 $blocking_transport[] = &$working_transport['fopen'];
-            } else if ( true === WP_Http_Fsockopen::test($args) ) {
+            } else */ if ( true === WP_Http_Fsockopen::test($args) ) {
                 $working_transport['fsockopen'] = new WP_Http_Fsockopen();
                 $blocking_transport[] = &$working_transport['fsockopen'];

trunk/wp-includes/functions.php

@@ -315 +315 @@
     $option = trim($option);
     if ( empty($option) )
+        return false;
+
+    if ( defined( 'WP_SETUP_CONFIG' ) )
         return false;