From 76f77416d621ecd9524a41f3620378b11f8cce89 Mon Sep 17 00:00:00 2001 From: dd32 Date: Mon, 27 Nov 2017 02:58:02 +0000 Subject: [PATCH] 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]. See #6531. Fixes #42573. git-svn-id: https://develop.svn.wordpress.org/trunk@42242 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/plugin.php | 13 ------------- src/wp-includes/class-wp-theme.php | 30 +++--------------------------- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php index 1236723f8d..1a9889d3d3 100644 --- a/src/wp-admin/includes/plugin.php +++ b/src/wp-admin/includes/plugin.php @@ -194,17 +194,6 @@ function get_plugin_files( $plugin ) { $plugin_file = WP_PLUGIN_DIR . '/' . $plugin; $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 ) ); if ( is_dir( $dir ) && WP_PLUGIN_DIR !== $dir ) { @@ -225,8 +214,6 @@ function get_plugin_files( $plugin ) { $plugin_files = array_values( array_unique( $plugin_files ) ); } - set_transient( $transient_key, $plugin_files, HOUR_IN_SECONDS ); - return $plugin_files; } diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php index 171d8b6c58..d98085a3df 100644 --- a/src/wp-includes/class-wp-theme.php +++ b/src/wp-includes/class-wp-theme.php @@ -984,34 +984,10 @@ final class WP_Theme implements ArrayAccess { * being absolute paths. */ 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 ); + $files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth ); - $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; - } + if ( $search_parent && $this->parent() ) { + $files += (array) self::scandir( $this->get_template_directory(), $type, $depth ); } return $files;