golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2010-05-03 06:28:05 +00:00
parent 4d7c88f4a4
commit 0b597379e4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/setup-config.php
View File

@ -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

4
wp-includes/class-http.php
View File

@ -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'];
}

3
wp-includes/functions.php
View File

@ -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();