<!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>[11479] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php: Theme Directory: Move the "twenty" theme check to a better place, so that `get_theme_post()` can be run earlier.</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/11479">11479</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/11479","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>2022-01-27 04:14:37 +0000 (Thu, 27 Jan 2022)</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: Move the "twenty" theme check to a better place, so that `get_theme_post()` can be run earlier.
This unbreaks SVN use of the theme directory.
Reverts <a href="http://meta.trac.wordpress.org/changeset/11474">[11474]</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>
</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 2022-01-27 01:28:57 UTC (rev 11478)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2022-01-27 04:14:37 UTC (rev 11479)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,6 +396,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_slug = sanitize_title_with_dashes( $this->theme_slug );
</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">+ // Account for "twenty" themes, these themes have slugs that do not match the normal conventions.
+ $this->theme_slug = str_replace(
+ array( 'twenty-ten', 'twenty-eleven', 'twenty-twelve', 'twenty-thirteen', 'twenty-fourteen', 'twenty-fifteen', 'twenty-sixteen', 'twenty-seventeen', 'twenty-eighteen', 'twenty-nineteen', 'twenty-twenty-one', 'twenty-twenty-two', 'twenty-twenty-three', 'twenty-twenty-four', 'twenty-twenty-five', 'twenty-twenty-six', 'twenty-twenty-seven', 'twenty-twenty-eight', 'twenty-twenty-nine', 'twenty-thirty', 'twenty-twenty'),
+ array( 'twentyten', 'twentyeleven', 'twentytwelve', 'twentythirteen', 'twentyfourteen', 'twentyfifteen', 'twentysixteen', 'twentyseventeen', 'twentyeighteen', 'twentynineteen', 'twentytwentyone', 'twentytwentytwo', 'twentytwentythree', 'twentytwentyfour', 'twentytwentyfive', 'twentytwentysix', 'twentytwentyseven', 'twentytwentyeight', 'twentytwentynine', 'twentythirty', 'twentytwenty' ),
+ $this->theme_slug
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->theme_name || ! $this->theme_slug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'The theme has no name.', 'wporg-themes' ) . ' ';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,6 +430,11 @@
</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">+ // Populate the theme post.
+ if ( ! $this->theme_post ) {
+ $this->theme_post = $this->get_theme_post();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Populate author.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->author ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +445,6 @@
</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"> // Make sure it doesn't use a slug deemed not to be used by the public.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This check must be run before `get_theme_post()` to account for "twenty" themes.
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $this->has_reserved_slug() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $style_errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'reserved_slug',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,12 +457,6 @@
</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">- // Populate the theme post.
- // Like it says above, the has_reserved_slug() function *must* run before this.
- if ( ! $this->theme_post ) {
- $this->theme_post = $this->get_theme_post();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $theme_description = $this->strip_non_utf8( (string) $this->theme->get( 'Description' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $theme_description ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'The theme has no description.', 'wporg-themes' ) . ' ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -962,12 +967,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function has_reserved_slug() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slug = str_replace(
- array( 'twenty-ten', 'twenty-eleven', 'twenty-twelve', 'twenty-thirteen', 'twenty-fourteen', 'twenty-fifteen', 'twenty-sixteen', 'twenty-seventeen', 'twenty-eighteen', 'twenty-nineteen', 'twenty-twenty-one', 'twenty-twenty-two', 'twenty-twenty-three', 'twenty-twenty-four', 'twenty-twenty-five', 'twenty-twenty-six', 'twenty-twenty-seven', 'twenty-twenty-eight', 'twenty-twenty-nine', 'twenty-thirty', 'twenty-twenty'),
- array( 'twentyten', 'twentyeleven', 'twentytwelve', 'twentythirteen', 'twentyfourteen', 'twentyfifteen', 'twentysixteen', 'twentyseventeen', 'twentyeighteen', 'twentynineteen', 'twentytwentyone', 'twentytwentytwo', 'twentytwentythree', 'twentytwentyfour', 'twentytwentyfive', 'twentytwentysix', 'twentytwentyseven', 'twentytwentyeight', 'twentytwentynine', 'twentythirty', 'twentytwenty' ),
- $this->theme_slug
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $reserved_slugs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Reserve "twenty" names for wordpressdotorg.
</span><span class="cx" style="display: block; padding: 0 10px"> 'twentyten', 'twentyeleven', 'twentytwelve','twentythirteen', 'twentyfourteen', 'twentyfifteen',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,6 +973,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'twentysixteen', 'twentyseventeen','twentyeighteen', 'twentynineteen', 'twentytwenty',
</span><span class="cx" style="display: block; padding: 0 10px"> 'twentytwentyone', 'twentytwentytwo', 'twentytwentythree', 'twentytwentyfour', 'twentytwentyfive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'twentytwentysix', 'twentytwentyseven', 'twentytwentyeight', 'twentytwentynine', 'twentythirty',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Theme Showcase URL parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> 'browse', 'tag', 'search', 'filter', 'upload', 'commercial',
</span><span class="cx" style="display: block; padding: 0 10px"> 'featured', 'popular', 'new', 'updated',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -980,16 +980,10 @@
</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"> // If it's not a reserved slug, they can have it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (
- ! in_array( $slug, $reserved_slugs, true ) &&
- ! in_array( $this->theme_slug, $reserved_slugs, true )
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $this->theme_slug, $reserved_slugs, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- // force the slug to be correct for the twenty-x themes.
- $this->theme_slug = $slug;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // WordPress.org user is always allowed to upload reserved slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'wordpressdotorg' === $this->author->user_login ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -996,16 +990,14 @@
</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"> // Only committers uploading a default theme *update* are left to be checked for.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme_post = $this->get_theme_post();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // New default themes MUST be uploaded by `wordpressdotorg` and will fail this check.
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> // Updates only.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme_post &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->theme_post &&
</ins><span class="cx" style="display: block; padding: 0 10px"> // The current user is a Core Committer. [ 'user_login' => 'Trac Title', ... ]
</span><span class="cx" style="display: block; padding: 0 10px"> ! empty( $GLOBALS['committers'][ $this->author->user_login ] ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> // The theme is owned by WordPress.org.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wordpressdotorg' === get_user_by( 'id', $theme_post->post_author )->user_login
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wordpressdotorg' === get_user_by( 'id', $this->theme_post->post_author )->user_login
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Slug is reserved, but an update is being uploaded by a core committer.
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>