WordPress.org

Make WordPress Core

Changeset 14361


Ignore:
Timestamp:
05/03/2010 06:28:05 AM (10 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/setup-config.php

    r14081 r14361  
    2727 * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
    2828 */
    29 error_reporting(0);
     29error_reporting(E_ALL &~ E_DEPRECATED);
    3030
    3131/**#@+
  • trunk/wp-includes/class-http.php

    r14134 r14361  
    9090
    9191        if ( is_null($working_transport) ) {
    92             if ( true === WP_Http_ExtHttp::test($args) ) {
     92            /* if ( true === WP_Http_ExtHttp::test($args) ) {
    9393                $working_transport['exthttp'] = new WP_Http_ExtHttp();
    9494                $blocking_transport[] = &$working_transport['exthttp'];
     
    102102                $working_transport['fopen'] = new WP_Http_Fopen();
    103103                $blocking_transport[] = &$working_transport['fopen'];
    104             } else if ( true === WP_Http_Fsockopen::test($args) ) {
     104            } else */ if ( true === WP_Http_Fsockopen::test($args) ) {
    105105                $working_transport['fsockopen'] = new WP_Http_Fsockopen();
    106106                $blocking_transport[] = &$working_transport['fsockopen'];
  • trunk/wp-includes/functions.php

    r14360 r14361  
    315315    $option = trim($option);
    316316    if ( empty($option) )
     317        return false;
     318
     319    if ( defined( 'WP_SETUP_CONFIG' ) )
    317320        return false;
    318321
Note: See TracChangeset for help on using the changeset viewer.