diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 1236723f8d..1a9889d3d3 100644 --- a/wp-admin/includes/plugin.php +++ b/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/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php index 171d8b6c58..d98085a3df 100644 --- a/wp-includes/class-wp-theme.php +++ b/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; diff --git a/wp-includes/version.php b/wp-includes/version.php index 3a9ad7a36d..20a5523ba9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42228'; +$wp_version = '5.0-alpha-42242'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.