From 0b597379e40f2c25b1c21087cca2eaf1db58907e Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 3 May 2010 06:28:05 +0000
Subject: [PATCH] Prevent fatal error when falling back to fsockopen in the
 setup-config.php key/salt HTTP request. fixes #13030.

git-svn-id: http://svn.automattic.com/wordpress/trunk@14361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/setup-config.php  | 2 +-
 wp-includes/class-http.php | 4 ++--
 wp-includes/functions.php  | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 50b1962e2..8b15f6bf7 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -26,7 +26,7 @@ define('WP_SETUP_CONFIG', true);
  *
  * 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);
 
 /**#@+
  * These three defines are required to allow us to use require_wp_db() to load
diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index b5075cc32..ce733c494 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -89,7 +89,7 @@ class WP_Http {
 		static $working_transport, $blocking_transport, $nonblocking_transport;
 
 		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'];
 			} else if ( true === WP_Http_Curl::test($args) ) {
@@ -101,7 +101,7 @@ class WP_Http {
 			} else if ( true === WP_Http_Fopen::test($args) ) {
 				$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'];
 			}
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 674714301..46fd643b1 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -316,6 +316,9 @@ function get_option( $option, $default = false ) {
 	if ( empty($option) )
 		return false;
 
+	if ( defined( 'WP_SETUP_CONFIG' ) )
+		return false;
+
 	// prevent non-existent options from triggering multiple queries
 	if ( defined( 'WP_INSTALLING' ) && is_multisite() ) {
 		$notoptions = array();