From 7beb454ef28bc17a491e71ffba1e081713a6c851 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Tue, 13 Apr 2010 21:45:57 +0000 Subject: [PATCH] Always include class-http.php. see #12990 git-svn-id: https://develop.svn.wordpress.org/trunk@14079 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/http.php | 3 --- wp-settings.php | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/wp-includes/http.php b/wp-includes/http.php index 1a66dd0e74..63cf97d1f9 100644 --- a/wp-includes/http.php +++ b/wp-includes/http.php @@ -22,9 +22,6 @@ function &_wp_http_get_object() { static $http; - if ( ! class_exists('WP_Http') ) - require( ABSPATH . WPINC . '/class-http.php' ); - if ( is_null($http) ) $http = new WP_Http(); diff --git a/wp-settings.php b/wp-settings.php index 4ee0ef372a..7468912608 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -129,6 +129,7 @@ require( ABSPATH . WPINC . '/canonical.php' ); require( ABSPATH . WPINC . '/shortcodes.php' ); require( ABSPATH . WPINC . '/media.php' ); require( ABSPATH . WPINC . '/http.php' ); +require( ABSPATH . WPINC . '/class-http.php' ); require( ABSPATH . WPINC . '/widgets.php' ); require( ABSPATH . WPINC . '/nav-menu.php' ); require( ABSPATH . WPINC . '/nav-menu-template.php' );