<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42243] branches/4.9: Theme/Plugin Editor: Remove the caching added in [41806] as it causes more problems than it fixes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/42243">42243</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42243","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-27 02:59:27 +0000 (Mon, 27 Nov 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Theme/Plugin Editor: Remove the caching added in <a href="https://core.trac.wordpress.org/changeset/41806">[41806]</a> 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 <a href="https://core.trac.wordpress.org/changeset/41806">[41806]</a>.
Merges <a href="https://core.trac.wordpress.org/changeset/42242">[42242]</a> to the 4.9 branch.
See <a href="https://core.trac.wordpress.org/ticket/6531">#6531</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/42573">#42573</a> for 4.9.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpadminincludespluginphp">branches/4.9/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#branches49srcwpincludesclasswpthemephp">branches/4.9/src/wp-includes/class-wp-theme.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.9 2017-11-27 02:58:02 UTC (rev 42242)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9 2017-11-27 02:59:27 UTC (rev 42243)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches49srcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/includes/plugin.php 2017-11-27 02:58:02 UTC (rev 42242)
+++ branches/4.9/src/wp-admin/includes/plugin.php 2017-11-27 02:59:27 UTC (rev 42243)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,17 +194,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
</span><span class="cx" style="display: block; padding: 0 10px"> $dir = dirname( $plugin_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $plugin_files = array( plugin_basename( $plugin_file ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( $dir ) && WP_PLUGIN_DIR !== $dir ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,8 +214,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_files = array_values( array_unique( $plugin_files ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_transient( $transient_key, $plugin_files, HOUR_IN_SECONDS );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $plugin_files;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches49srcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/class-wp-theme.php 2017-11-27 02:58:02 UTC (rev 42242)
+++ branches/4.9/src/wp-includes/class-wp-theme.php 2017-11-27 02:59:27 UTC (rev 42243)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,36 +984,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * being absolute paths.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_files( $type = null, $depth = 0, $search_parent = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $search_parent && $this->parent() ) {
+ $files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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;
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $files;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>