<!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>[32408] branches/3.9/src/wp-admin/includes: When upgrading WordPress remove genericons example.html files</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/32408">32408</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/32408","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-06 20:19:38 +0000 (Wed, 06 May 2015)</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'>When upgrading WordPress remove genericons example.html files
<a href="https://core.trac.wordpress.org/changeset/32385">[32385]</a> for 3.9 branch
Props @dd32, @boonebgorges, @johnjamesjacoby, @drewapicture, @jorbin</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches39srcwpadminincludesclasswpupgraderphp">branches/3.9/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#branches39srcwpadminincludesupdatecorephp">branches/3.9/src/wp-admin/includes/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches39srcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/src/wp-admin/includes/class-wp-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/src/wp-admin/includes/class-wp-upgrader.php 2015-05-06 20:07:58 UTC (rev 32407)
+++ branches/3.9/src/wp-admin/includes/class-wp-upgrader.php 2015-05-06 20:19:38 UTC (rev 32408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1434,10 +1434,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $working_dir;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy update-core.php from the new version into place.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete($working_dir, true);
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
</span></span></pre></div>
<a id="branches39srcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/src/wp-admin/includes/update-core.php 2015-05-06 20:07:58 UTC (rev 32407)
+++ branches/3.9/src/wp-admin/includes/update-core.php 2015-05-06 20:19:38 UTC (rev 32408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1011,6 +1011,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete($old_file, true);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove any Genericons example.html's from the filesystem
+ _upgrade_422_remove_genericons();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Upgrade DB with separate request
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/update-core.php */
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters( 'update_feedback', __( 'Upgrading database…' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1146,3 +1149,68 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Cleans up Genericons example files.
+ *
+ * @since 4.2.2
+ */
+function _upgrade_422_remove_genericons() {
+ global $wp_theme_directories, $wp_filesystem;
+
+ // A list of the affected files using the filesystem absolute paths.
+ $affected_files = array();
+
+ // Themes
+ foreach ( $wp_theme_directories as $directory ) {
+ $directory = trailingslashit( $directory );
+ $affected_theme_files = _upgrade_422_find_genericons_files_in_folder( $directory );
+ $affected_files = array_merge( $affected_files, $affected_theme_files );
+ }
+
+ // Plugins
+ $plugin_dir = trailingslashit( WP_PLUGIN_DIR );
+ $affected_plugin_files = _upgrade_422_find_genericons_files_in_folder( $plugin_dir );
+ $affected_files = array_merge( $affected_files, $affected_plugin_files );
+
+ foreach ( $affected_files as $file ) {
+ $gen_dir = $wp_filesystem->find_folder( dirname( $file ) . '/' );
+ if ( ! $gen_dir ) {
+ continue;
+ }
+ // The path when the file is accessed via WP_Filesystem may differ in the case of FTP
+ $remote_file = $gen_dir . basename( $file );
+
+ if ( ! $wp_filesystem->exists( $remote_file ) ) {
+ continue;
+ }
+
+ if ( ! $wp_filesystem->delete( $remote_file, false, 'f' ) ) {
+ $wp_filesystem->put_contents( $remote_file, '' );
+ }
+ }
+}
+
+/**
+ * Recursively find Genericons example files in a given folder.
+ *
+ * @ignore
+ * @since 4.2.2
+ *
+ * @param string $directory Directory path. Expects trailingslashed.
+ * @return array
+ */
+function _upgrade_422_find_genericons_files_in_folder( $directory ) {
+
+ $files = array();
+ if ( file_exists( "{$directory}example.html" ) && false !== strpos( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' ) ) {
+ $files[] = substr( "{$directory}example.html", strlen( $base ) );
+ }
+
+ foreach ( glob( $directory . '*', GLOB_ONLYDIR ) as $dir ) {
+ $dir = trailingslashit( $dir );
+ $files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) );
+ }
+
+ return $files;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>