Changeset 42243

Timestamp:

11/27/2017 02:59:27 AM (7 years ago)

Author:

dd32

Message:

Theme/Plugin Editor: Remove the caching added in [41806] as it causes more problems than it fixes.

While caching here seemed like a good idea in theory, in practice the cache would be often stale causing development issues.
We exclude common folders (such as node_modules) from the scanning to avoid directories which are not useful to the end-user, so as long as those exclusion lists are held up this shouldn't cause too much of a degredation in the future.
We may consider adding caching here again in the future if it's determined that it is really needed.

Props precies, ibenic, mariovalney, schlessera, and all the others who commented on the ticket(s).
This partually reverts [41806].
Merges [42242] to the 4.9 branch.
See #6531.
Fixes #42573 for 4.9.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/plugin.php (modified) (2 diffs)
• src/wp-includes/class-wp-theme.php (modified) (1 diff)

branches/4.9/src/wp-admin/includes/plugin.php

@@ -195 +195 @@
     $dir = dirname( $plugin_file );
 
-    $data = get_plugin_data( $plugin_file );
-    $label = isset( $data['Version'] )
-        ? sanitize_key( 'files_' . $plugin . '-' . $data['Version'] )
-        : sanitize_key( 'files_' . $plugin );
-    $transient_key = substr( $label, 0, 29 ) . md5( $label );
-
-    $plugin_files = get_transient( $transient_key );
-    if ( false !== $plugin_files ) {
-        return $plugin_files;
-    }
-
     $plugin_files = array( plugin_basename( $plugin_file ) );
 
@@ -225 +214 @@
         $plugin_files = array_values( array_unique( $plugin_files ) );
     }
-
-    set_transient( $transient_key, $plugin_files, HOUR_IN_SECONDS );
 
     return $plugin_files;

branches/4.9/src/wp-includes/class-wp-theme.php

@@ -985 +985 @@
      */
     public function get_files( $type = null, $depth = 0, $search_parent = false ) {
-        // 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;
-            }
+        $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 );
         }