Ticket #41318: 41318.1.patch

src/wp-admin/includes/file.php

@@ -129 +129 @@
         if ( empty($folder) )
                 return false;
 
+        $folder = untrailingslashit( $folder );
+
         if ( ! $levels )
                 return false;
 

tests/phpunit/tests/file.php

@@ -155 +155 @@
                 unlink($this->dir . DIRECTORY_SEPARATOR . $filename);
         }
 
+        function test_list_files() {
+                $directory = '/tmp' . DIRECTORY_SEPARATOR . 'testdir';
+
+                $files = array(
+                        $directory . DIRECTORY_SEPARATOR . 'test_1.txt',
+                        $directory . DIRECTORY_SEPARATOR . 'test_2.txt',
+                        $directory . DIRECTORY_SEPARATOR . 'test_3.txt',
+                );
+
+                wp_mkdir_p( $directory );
+                foreach ( $files as $file ) {
+                        file_put_contents( $file, 'hi' );
+                }
+
+                $listed_files = list_files( $directory );
+                sort( $listed_files );
+
+                $this->assertEquals( $files, $listed_files );
+
+                // Test also for https://core.trac.wordpress.org/ticket/41318
+                $listed_files = list_files( trailingslashit( $directory ) );
+                sort( $listed_files );
+
+                $this->assertEquals( $files, $listed_files );
+
+                $this->rmdir( $directory );
+        }
+
         /**
          * @dataProvider data_wp_tempnam_filenames
          */