<!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>[10431] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Theme Directory: Block duplicate Theme URI's (except when by the current author) and add a "Are you sure you want to upload this here" type message for those who are lost.</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/10431">10431</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/10431","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>2020-11-06 04:30:43 +0000 (Fri, 06 Nov 2020)</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: Block duplicate Theme URI's (except when by the current author) and add a "Are you sure you want to upload this here" type message for those who are lost.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4039">#4039</a>.</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_htmlwpcontentpluginsthemedirectoryquerymodificationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/query-modifications.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 2020-11-05 20:15:30 UTC (rev 10430)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2020-11-06 04:30:43 UTC (rev 10431)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error .= sprintf( __( 'Add a %1$s line to your %2$s file and upload the theme again. <a href="%3$s">Theme Style Sheets</a>', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>Theme Name:</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>style.css</code>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet', 'wporg-themes' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'https://codex.wordpress.org/Theme_Development#Theme_Stylesheet', 'wporg-themes' )
</ins><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"> return $error;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error .= sprintf( __( 'Add a %1$s line to your %2$s file and upload the theme again. <a href="%3$s">Theme Style Sheets</a>', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>Description:</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>style.css</code>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet', 'wporg-themes' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'https://codex.wordpress.org/Theme_Development#Theme_Stylesheet', 'wporg-themes' )
</ins><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"> return $error;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error .= sprintf( __( 'Add a %1$s line to your %2$s file and upload the theme again. <a href="%3$s">Theme Style Sheets</a>', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>Tags:</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>style.css</code>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet', 'wporg-themes' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'https://codex.wordpress.org/Theme_Development#Theme_Stylesheet', 'wporg-themes' )
</ins><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"> return $error;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error .= sprintf( __( 'Add a %1$s line to your %2$s file and upload the theme again. <a href="%3$s">Theme Style Sheets</a>', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>Version:</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>style.css</code>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet', 'wporg-themes' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'https://codex.wordpress.org/Theme_Development#Theme_Stylesheet', 'wporg-themes' )
</ins><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"> return $error;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,15 +235,7 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make sure we have version that is higher than any previously uploaded version of this theme.
- if ( ! empty( $this->theme_post ) && ! version_compare( $this->theme->get( 'Version' ), $this->theme_post->max_version, '>' ) ) {
- /* translators: 1: theme name, 2: theme version, 3: style.css */
- return sprintf( __( 'You need to upload a version of %1$s higher than %2$s. Increase the theme version number in %3$s, then upload your zip file again.', 'wporg-themes' ),
- $this->theme->display( 'Name' ),
- '<code>' . $this->theme_post->max_version . '</code>',
- '<code>style.css</code>'
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Version is greater than current version happens after authorship checks.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent duplicate URLs.
</span><span class="cx" style="display: block; padding: 0 10px"> $themeuri = $this->theme->get( 'ThemeURI' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,6 +252,16 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Generic text to suggest "Are you in the right place?"
+ $are_you_in_the_right_place = '<br>' .
+ __( 'The WordPress.org Theme Directory is for sharing a unique theme with others, duplicates are not allowed.', 'wporg-themes' ) .
+ '<br>' .
+ sprintf(
+ /* translators: %s: A link to https://wordpress.org/support/article/using-themes/ */
+ __( "If you're attempting to install a theme on your website, <a href='%s'>please see this article</a>.", 'wporg-themes' ),
+ 'https://wordpress.org/support/article/using-themes/'
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Is there already a theme with the name name by a different author?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->theme_post ) && $this->theme_post->post_author != $this->author->ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: theme slug, 2: style.css */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,9 +268,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'There is already a theme called %1$s by a different author. Please change the name of your theme in %2$s and upload it again.', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $this->theme_slug . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>style.css</code>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) . $are_you_in_the_right_place;
</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">+ // Check if the ThemeURI is already in use by another theme by another author.
+ if ( empty( $this->theme_post ) && ! empty( $themeuri ) ) {
+ $theme_uri_matches = get_posts( [
+ 'post_type' => 'repopackage',
+ 'post_status' => 'publish',
+ 'meta_query' => [
+ 'theme_uri_search' => [
+ 'key' => '_theme_url',
+ 'value' => '"' . $themeuri . '"', // Searching within a Serialized PHP value
+ 'compare' => 'LIKE'
+ ],
+ ]
+ ] );
+ $theme_owners = wp_list_pluck( $theme_uri_matches, 'post_author' );
+
+ if ( $theme_owners && ! in_array( $this->author->ID, $theme_owners ) ) {
+ return sprintf(
+ /* translators: 1: theme name, 2: style.css */
+ __( 'There is already a theme using the Theme URL %1$s by a different author. Please check the URI of your theme in %2$s and upload it again.', 'wporg-themes' ),
+ '<code>' . esc_html( $theme_uri ) . '</code>',
+ '<code>style.css</code>'
+ ) . $are_you_in_the_right_place;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We know it's the correct author, now we can check if it's suspended.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->theme_post ) && 'suspend' === $this->theme_post->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: mailto link */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,6 +304,16 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure we have version that is higher than any previously uploaded version of this theme. This check happens last to allow the non-author blocks to kick in.
+ if ( ! empty( $this->theme_post ) && ! version_compare( $this->theme->get( 'Version' ), $this->theme_post->max_version, '>' ) ) {
+ /* translators: 1: theme name, 2: theme version, 3: style.css */
+ return sprintf( __( 'You need to upload a version of %1$s higher than %2$s. Increase the theme version number in %3$s, then upload your zip file again.', 'wporg-themes' ),
+ $this->theme->display( 'Name' ),
+ '<code>' . $this->theme_post->max_version . '</code>',
+ '<code>style.css</code>'
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't send special themes through Theme Check.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! has_category( 'special-case-theme', $this->theme_post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Pass it through Theme Check and see how great this theme really is.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryquerymodificationsphp"></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/query-modifications.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/query-modifications.php 2020-11-05 20:15:30 UTC (rev 10430)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/query-modifications.php 2020-11-06 04:30:43 UTC (rev 10431)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> empty( $query->query_vars['name'] ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> empty( $query->query_vars['author_name'] ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! in_array( $query->query_vars['browse'], array( 'favorites', 'new', 'updated' ) ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- empty( $query->query_vars['meta_query']['trac_sync_ticket_id'] ) // jobs/class-trac-sync.php - Always needs to find the post, and looks up via a meta search.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ empty( $query->query_vars['meta_query']['trac_sync_ticket_id'] ) && // jobs/class-trac-sync.php - Always needs to find the post, and looks up via a meta search.
+ empty( $query->query_vars['meta_query']['theme_uri_search'] ) // class-wporg-themes-upload.php - Searching all known themes by meta value.
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query->query_vars['date_query']['recent_themes_only'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'column' => 'post_modified',
</span></span></pre>
</div>
</div>
</body>
</html>