From c6511562c6d3aee3be7a3198c9c723e1a439b10f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 17 Feb 2017 21:23:52 +0000 Subject: [PATCH] Media: In `wp_unique_filename()`, use explicit type casting when incrementing `$number`. This prevents the "non-numeric value encountered" warning in PHP 7.1, caused by trying to increment an empty string on the first loop iteration. Props drrobotnik for initial patch. Merges [40039] to the 4.7 branch. Fixes #39774. git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40075 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/functions.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index 01045f038d..b96e2aba67 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -2074,7 +2074,7 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) // Check for both lower and upper case extension or image sub-sizes may be overwritten. while ( file_exists($dir . "/$filename") || file_exists($dir . "/$filename2") ) { - $new_number = $number + 1; + $new_number = (int) $number + 1; $filename = str_replace( array( "-$number$ext", "$number$ext" ), "-$new_number$ext", $filename ); $filename2 = str_replace( array( "-$number$ext2", "$number$ext2" ), "-$new_number$ext2", $filename2 ); $number = $new_number; @@ -2094,11 +2094,13 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) } while ( file_exists( $dir . "/$filename" ) ) { + $new_number = (int) $number + 1; if ( '' == "$number$ext" ) { - $filename = "$filename-" . ++$number; + $filename = "$filename-" . $new_number; } else { - $filename = str_replace( array( "-$number$ext", "$number$ext" ), "-" . ++$number . $ext, $filename ); + $filename = str_replace( array( "-$number$ext", "$number$ext" ), "-" . $new_number . $ext, $filename ); } + $number = $new_number; } }