Changeset 40075

Timestamp:

02/17/2017 09:23:52 PM (10 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (2 diffs)

branches/4.7/src/wp-includes/functions.php

@@ -2075 +2075 @@
                         // 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 );
@@ -2095 +2095 @@
 
                 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;
                 }
         }