From a859b46e92a69cbfd04e1bb68370873caf78b140 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 18 Oct 2017 15:04:51 +0000 Subject: [PATCH] I18N: Replace function name in error message in `WP_Http_Curl::request()` and `WP_Http_Streams::request()` with a placeholder. Props ramiy. Fixes #41666. Built from https://develop.svn.wordpress.org/trunk@41901 git-svn-id: http://core.svn.wordpress.org/trunk@41735 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-http-curl.php | 10 ++++++++-- wp-includes/class-wp-http-streams.php | 10 ++++++++-- wp-includes/version.php | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/wp-includes/class-wp-http-curl.php b/wp-includes/class-wp-http-curl.php index 27588fba39..3e1d012c4d 100644 --- a/wp-includes/class-wp-http-curl.php +++ b/wp-includes/class-wp-http-curl.php @@ -179,8 +179,14 @@ class WP_Http_Curl { $this->stream_handle = @fopen( $r['filename'], 'w+' ); else $this->stream_handle = fopen( $r['filename'], 'w+' ); - if ( ! $this->stream_handle ) - return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) ); + if ( ! $this->stream_handle ) { + return new WP_Error( 'http_request_failed', sprintf( + /* translators: 1: fopen() 2: file name */ + __( 'Could not open handle for %1$s to %2$s.' ), + 'fopen()', + $r['filename'] + ) ); + } } else { $this->stream_handle = false; } diff --git a/wp-includes/class-wp-http-streams.php b/wp-includes/class-wp-http-streams.php index 49cadbe194..325c509fbf 100644 --- a/wp-includes/class-wp-http-streams.php +++ b/wp-includes/class-wp-http-streams.php @@ -223,8 +223,14 @@ class WP_Http_Streams { $stream_handle = @fopen( $r['filename'], 'w+' ); else $stream_handle = fopen( $r['filename'], 'w+' ); - if ( ! $stream_handle ) - return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) ); + if ( ! $stream_handle ) { + return new WP_Error( 'http_request_failed', sprintf( + /* translators: 1: fopen() 2: file name */ + __( 'Could not open handle for %1$s to %2$s.' ), + 'fopen()', + $r['filename'] + ) ); + } $bytes_written = 0; while ( ! feof($handle) && $keep_reading ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index c4c0ef0ded..c7af8e2993 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-beta2-41900'; +$wp_version = '4.9-beta2-41901'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.