Changeset 41806 for trunk/src/wp-includes/class-wp-theme.php

Timestamp:

10/10/2017 05:33:57 AM (7 years ago)

Author:

pento

Message:

File Editor: Add support for more than one sub-directory level.

The theme and plugin editors now list all files in the selected theme or plugin, recursing through subdirectories as necessary.

Props WraithKenny, schlessera, chsxf, MikeHansenMe, Daedalon, valendesigns, westonruter, pento.
Fixes #6531.

File:

• trunk/src/wp-includes/class-wp-theme.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-theme.php

@@ -982 +982 @@
      * @param bool $search_parent Optional. Whether to return parent files. Defaults to false.
      * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values
-     *               being absolute paths.
+     *               being absolute paths.
      */
     public function get_files( $type = null, $depth = 0, $search_parent = false ) {
-        $files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
-
-        if ( $search_parent && $this->parent() )
-            $files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+        // get and cache all theme files to start with.
+        $label = sanitize_key( 'files_' . $this->cache_hash . '-' . $this->get( 'Version' ) );
+        $transient_key = substr( $label, 0, 29 ) . md5( $label );
+
+        $all_files = get_transient( $transient_key );
+        if ( false === $all_files ) {
+            $all_files = (array) self::scandir( $this->get_stylesheet_directory(), null, -1 );
+
+            if ( $search_parent && $this->parent() ) {
+                $all_files += (array) self::scandir( $this->get_template_directory(), null, -1 );
+            }
+
+            set_transient( $transient_key, $all_files, HOUR_IN_SECONDS );
+        }
+
+        // Filter $all_files by $type & $depth.
+        $files = array();
+        if ( $type ) {
+            $type = (array) $type;
+            $_extensions = implode( '|', $type );
+        }
+        foreach ( $all_files as $key => $file ) {
+            if ( $depth >= 0 && substr_count( $key, '/' ) > $depth ) {
+                continue; // Filter by depth.
+            }
+            if ( ! $type || preg_match( '~\.(' . $_extensions . ')$~', $file ) ) { // Filter by type.
+                $files[ $key ] = $file;
+            }
+        }
 
         return $files;
@@ -1108 +1133 @@
      */
     private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-        if ( ! is_dir( $path ) )
+        if ( ! is_dir( $path ) ) {
             return false;
+        }
 
         if ( $extensions ) {
@@ -1117 +1143 @@
 
         $relative_path = trailingslashit( $relative_path );
-        if ( '/' == $relative_path )
+        if ( '/' == $relative_path ) {
             $relative_path = '';
+        }
 
         $results = scandir( $path );
@@ -1126 +1153 @@
          * Filters the array of excluded directories and files while scanning theme folder.
          *
-         * @since 4.7.4
+         * @since 4.7.4
          *
          * @param array $exclusions Array of excluded directories and files.
          */
-        $exclusions = (array) apply_filters( 'theme_scandir_exclusions', array( 'CVS', 'node_modules' ) );
+        $exclusions = (array) apply_filters( 'theme_scandir_exclusions', array( 'CVS', 'node_modules', 'vendor', 'bower_components' ) );
 
         foreach ( $results as $result ) {
@@ -1137 +1164 @@
             }
             if ( is_dir( $path . '/' . $result ) ) {
-                if ( ! $depth )
+                if ( ! $depth ) {
                     continue;
+                }
                 $found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
                 $files = array_merge_recursive( $files, $found );