Changeset 25052

Timestamp:

08/18/2013 08:21:11 AM (13 years ago)

Author:

dd32

Message:

WP_HTTP: Curl: When using Stream-to-file on servers using mbstring.func_overload ensure that the file is written out correctly. Props DrProtocols. See #25061 for 3.6

File:

• branches/3.6/wp-includes/class-http.php (modified) (2 diffs)

branches/3.6/wp-includes/class-http.php

@@ -1303 +1303 @@
          */
         private function stream_body( $handle, $data ) {
+                if ( function_exists( 'ini_get' ) && ( ini_get( 'mbstring.func_overload' ) & 2 ) && function_exists( 'mb_internal_encoding' ) ) {
+                        $mb_encoding = mb_internal_encoding();
+                        mb_internal_encoding( 'ISO-8859-1' );
+                }
+
                 if ( $this->max_body_length && ( strlen( $this->body ) + strlen( $data ) ) > $this->max_body_length )
                         $data = substr( $data, 0, ( $this->max_body_length - strlen( $this->body ) ) );
@@ -1311 +1316 @@
                         $this->body .= $data;
 
-                return strlen( $data );
+                $data_length = strlen( $data );
+
+                if ( isset( $mb_encoding ) )
+                        mb_internal_encoding( $mb_encoding );
+
+                return $data_length;
         }