Changeset 8893

Timestamp:

05/30/2019 03:03:00 AM (5 years ago)

Author:

tellyworth

Message:

Plugin dir: make sure the importer sees all of the plugin source tree.

Also make sure we recurse through it all when looking for blocks. This should pick up additional blocks that were not detected earlier.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -311 +311 @@
                 array(
                     'ignore-externals',
-                    'depth' => 'files',
                 )
             );
@@ -322 +321 @@
                     array(
                         'ignore-externals',
-                        'depth' => 'files',
                     )
                 );
@@ -346 +344 @@
                 array(
                     'ignore-externals',
-                    'depth' => 'files', // Only export the root files, we don't need the rest to read the plugin headers/screenshots
                 )
             );
@@ -410 +407 @@
         // Find blocks
         $blocks = array();
-        foreach ( Filesystem::list_files( "$tmp_dir/export/", false, '!\.(?:php|js|jsx|json)$!i' ) as $filename ) {
+        foreach ( Filesystem::list_files( "$tmp_dir/export/", true /* recursive */, '!\.(?:php|js|jsx|json)$!i' ) as $filename ) {
             $file_blocks = $this->find_blocks_in_file( $filename );
             if ( $file_blocks ) {