<!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>[10874] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Theme Directory: Update the theme name & parent template when they change.</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 { white-space: pre-line; 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="http://meta.trac.wordpress.org/changeset/10874">10874</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/10874","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>2021-04-07 01:56:31 +0000 (Wed, 07 Apr 2021)</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 Directory: Update the theme name & parent template when they change.
This requires that the theme name still match the slug of the theme, but allows for things like case changes and accented character changes.
If the parent theme changes, ie. a Child theme is no longer a child theme, or is now a child theme of a different theme, that's handled appropriately.
(Hopefully this rarely happens, and if it does, it's to another supported & installed theme)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-04-07 00:21:07 UTC (rev 10873)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-04-07 01:56:31 UTC (rev 10874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -924,6 +924,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If we already have a post, get its ID.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->theme_post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->theme_post->ID;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // see wporg_themes_approve_version() for where the post is updated.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Otherwise create it for this new theme.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2021-04-07 00:21:07 UTC (rev 10873)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2021-04-07 01:56:31 UTC (rev 10874)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,17 +455,81 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_approve_version( $post_id, $version, $old_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $post ) {
+ // Should never happen.
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update wp-themes.com with this version.
</ins><span class="cx" style="display: block; padding: 0 10px"> wporg_themes_update_wpthemescom( $post->post_name, $version );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Update the post with this version's description and tags.
- $theme_data = wporg_themes_get_header_data( sprintf( 'https://themes.svn.wordpress.org/%1$s/%2$s/style.css', $post->post_name, $version ) );
- wp_update_post( array(
- 'ID' => $post_id,
- 'post_content' => $theme_data['Description'],
- 'tags_input' => $theme_data['Tags'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update the post with this version's name, parent theme, description, and tags.
+ $theme_data = wporg_themes_get_header_data( sprintf(
+ 'https://themes.svn.wordpress.org/%1$s/%2$s/style.css',
+ $post->post_name,
+ $version
</ins><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">+ if ( $theme_data ) {
+
+ // Find the parent theme for this version.
+ $theme_parent_post_id = $post->post_parent;
+ if ( ! $theme_data['Template'] ) {
+ // No parent theme.
+ $theme_parent_post_id = 0;
+
+ } else if (
+ $post->post_parent &&
+ $theme_data['Template'] === get_post( $post->post_parent )->post_name
+ ) {
+ // The post_parent field is currently set correctly, since that post_id matches the template header.
+ $theme_parent_post_id = $post->post_parent;
+
+ } else {
+ // Theme headers say it has a parent, but we don't have the correct one set, search for it.
+ $parent_theme = get_posts( array(
+ 'name' => $theme_data['Template'],
+ 'post_type' => 'repopackage',
+ 'post_status' => 'any',
+ 'posts_per_page' => 1,
+ 'orderby' => 'ID',
+ 'suppress_filters' => false,
+ 'fields' => 'ids',
+ ) );
+
+ if ( $parent_theme ) {
+ $theme_parent_post_id = $parent_theme[0];
+ } else {
+ // We don't host the theme? Temporary problem? Assume it's right for now.
+ }
+ }
+
+ $theme_post_name = $post->post_title;
+ // Allow theme titles to change in case or accent: `ThemeName` => `Themename` + `ThemeName` => `ThemèName`
+ if ( $theme_post_name !== $theme_data['Name'] ) {
+ // Theme name has been updated. Make sure it still sanitizes to the same post.
+ $name_slugified = remove_accents( $theme_data['Name'] );
+ $name_slugified = preg_replace( '/%[a-f0-9]{2}/i', '', $name_slugified );
+ $name_slugified = sanitize_title_with_dashes( $name_slugified );
+
+ if ( $name_slugified === $post->post_name ) {
+ // The new name still ends up at the same post_name slug value, let them have it.
+ $theme_post_name = $theme_data['Name'];
+ }
+ }
+
+ wp_update_post( array(
+ 'ID' => $post_id,
+ 'post_title' => $theme_post_name,
+ 'post_content' => $theme_data['Description'],
+ 'post_parent' => $theme_parent_post_id,
+ 'tags_input' => $theme_data['Tags'],
+ ) );
+
+ // Refresh the $post object for notifications.
+ $post = get_post( $post_id );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Update current version. Used to prioritize localized themes.
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_live_version', $version );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +711,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Custom version of core's deprecated `get_theme_data()` function.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_file Path to the file.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array File headers.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|false File headers, or false on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_get_header_data( $theme_file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_allowed_tags = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,55 +737,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_data = file_get_contents( $theme_file, false, $context );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $theme_data ) {
+ // Failure reading, or empty style.css file.
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_data = str_replace( '\r', '\n', $theme_data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match( '|^[ \t\/*#@]*Theme Name:(.*)$|mi', $theme_data, $theme_name );
- preg_match( '|^[ \t\/*#@]*Theme URI:(.*)$|mi', $theme_data, $theme_uri );
- preg_match( '|^[ \t\/*#@]*Description:(.*)$|mi', $theme_data, $description );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( preg_match( '|^[ \t\/*#@]*Author URI:(.*)$|mi', $theme_data, $author_uri ) ) {
- $author_uri = esc_url( trim( $author_uri[1] ) );
- } else {
- $author_uri = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set defaults.
+ $author_uri = '';
+ $template = '';
+ $version = '';
+ $status = 'publish';
+ $tags = array();
+ $author = 'Anonymous';
+ $name = '';
+ $theme_uri = '';
+ $description = '';
+
+ if ( preg_match( '|^[ \t\/*#@]*Theme Name:(.*)$|mi', $theme_data, $m ) ) {
+ $name = wp_strip_all_tags( trim( $m[1] ) );
</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">- if ( preg_match( '|^[ \t\/*#@]*Template:(.*)$|mi', $theme_data, $template ) ) {
- $template = wp_kses( trim( $template[1] ), $themes_allowed_tags );
- } else {
- $template = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '|^[ \t\/*#@]*Theme URI:(.*)$|mi', $theme_data, $m ) ) {
+ $theme_uri = esc_url( trim( $m[1] ) );
</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">- if ( preg_match( '|^[ \t\/*#@]*Version:(.*)$|mi', $theme_data, $version ) ) {
- $version = wp_kses( trim( $version[1] ), $themes_allowed_tags );
- } else {
- $version = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '|^[ \t\/*#@]*Description:(.*)$|mi', $theme_data, $m ) ) {
+ $description = wp_kses( trim( $m[1] ), $themes_allowed_tags );
</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">- if ( preg_match( '|^[ \t\/*#@]*Status:(.*)$|mi', $theme_data, $status ) ) {
- $status = wp_kses( trim( $status[1] ), $themes_allowed_tags );
- } else {
- $status = 'publish';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '|^[ \t\/*#@]*Author:(.*)$|mi', $theme_data, $m ) ) {
+ $author = wp_kses( trim( $m[1] ), $themes_allowed_tags );
</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">- if ( preg_match( '|^[ \t\/*#@]*Tags:(.*)$|mi', $theme_data, $tags ) ) {
- $tags = array_map( 'trim', explode( ',', wp_kses( trim( $tags[1] ), array() ) ) );
- } else {
- $tags = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '|^[ \t\/*#@]*Author URI:(.*)$|mi', $theme_data, $m ) ) {
+ $author_uri = esc_url( trim( $m[1] ) );
</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">- if ( preg_match( '|^[ \t\/*#@]*Author:(.*)$|mi', $theme_data, $author_name ) ) {
- $author = wp_kses( trim( $author_name[1] ), $themes_allowed_tags );
- } else {
- $author = 'Anonymous';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '|^[ \t\/*#@]*Version:(.*)$|mi', $theme_data, $m ) ) {
+ $version = wp_strip_all_tags( trim( $m[1] ) );
</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">- $name = $theme = wp_kses( trim( $theme_name[1] ), $themes_allowed_tags );
- $theme_uri = esc_url( trim( $theme_uri[1] ) );
- $description = wp_kses( trim( $description[1] ), $themes_allowed_tags );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '|^[ \t\/*#@]*Template:(.*)$|mi', $theme_data, $m ) ) {
+ $template = wp_strip_all_tags( trim( $m[1] ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '|^[ \t\/*#@]*Status:(.*)$|mi', $theme_data, $m ) ) {
+ $status = wp_strip_all_tags( trim( $meta_key[1] ) );
+ }
+
+ if ( preg_match( '|^[ \t\/*#@]*Tags:(.*)$|mi', $theme_data, $m ) ) {
+ $tags = array_map( 'trim', explode( ',', wp_strip_all_tags( trim( $m[1] ) ) ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Name' => $name,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Title' => $theme,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Title' => $name,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'URI' => $theme_uri,
</span><span class="cx" style="display: block; padding: 0 10px"> 'Description' => $description,
</span><span class="cx" style="display: block; padding: 0 10px"> 'Author' => $author,
</span></span></pre>
</div>
</div>
</body>
</html>