From d577c673e2943d6663fc3b1d2d36253536790cde Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Mon, 9 Mar 2015 02:22:26 +0000 Subject: [PATCH] `self` should be used for accessing local static members. See #30799. Built from https://develop.svn.wordpress.org/trunk@31683 git-svn-id: http://core.svn.wordpress.org/trunk@31664 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-http.php | 8 ++++---- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index 8a655f006b..6ba1996b47 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -228,7 +228,7 @@ class WP_Http { $r['headers'] = array(); if ( ! is_array( $r['headers'] ) ) { - $processedHeaders = WP_Http::processHeaders( $r['headers'], $url ); + $processedHeaders = self::processHeaders( $r['headers'], $url ); $r['headers'] = $processedHeaders['headers']; } @@ -247,7 +247,7 @@ class WP_Http { } // Construct Cookie: header if any cookies are set. - WP_Http::buildCookieHeader( $r ); + self::buildCookieHeader( $r ); // Avoid issues where mbstring.func_overload is enabled. mbstring_binary_safe_encoding(); @@ -2116,7 +2116,7 @@ class WP_Http_Encoding { if ( false !== ( $decompressed = @gzinflate( $compressed ) ) ) return $decompressed; - if ( false !== ( $decompressed = WP_Http_Encoding::compatible_gzinflate( $compressed ) ) ) + if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) ) return $decompressed; if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) ) @@ -2194,7 +2194,7 @@ class WP_Http_Encoding { */ public static function accept_encoding( $url, $args ) { $type = array(); - $compression_enabled = WP_Http_Encoding::is_available(); + $compression_enabled = self::is_available(); if ( ! $args['decompress'] ) // Decompression specifically disabled. $compression_enabled = false; diff --git a/wp-includes/version.php b/wp-includes/version.php index fe1bd93136..d1f9f9e1ac 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31682'; +$wp_version = '4.2-alpha-31683'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.