<!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>[11176] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Theme Directory: Return a `WP_Error` object from `WPORG_Themes_Upload::process_upload()` instead of an array of error messages.</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/11176">11176</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/11176","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-08-13 02:25:40 +0000 (Fri, 13 Aug 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: Return a `WP_Error` object from `WPORG_Themes_Upload::process_upload()` instead of an array of error messages.</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_htmlwpcontentpluginsthemedirectoryuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/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 2021-08-12 06:54:30 UTC (rev 11175)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-08-13 02:25:40 UTC (rev 11176)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,12 +167,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Runs various tests, creates Trac ticket, repopackage post, and saves the files to the SVN repo.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return mixed Failure or success message.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Error|string Failure or success message.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function process_upload( $file_upload ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $valid_upload = $this->validate_upload( $file_upload );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $valid_upload ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return __( 'Error in file upload.', 'wporg-themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'invalid_input',
+ __( 'Error in file upload.', '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"> $this->create_tmp_dirs( $file_upload['name'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,19 +185,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // First things first. Do we have something to work with?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $theme_files ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return __( 'The zip file was empty.', 'wporg-themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'empty_zip',
+ __( 'The zip file was empty.', '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"> // Do we have a stylesheet? Life is kind of pointless without.
</span><span class="cx" style="display: block; padding: 0 10px"> $style_css = $this->get_style_css( $theme_files );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $style_css ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: style.css */
- return sprintf( __( 'The zip file must include a file named %s.', 'wporg-themes' ),
- '<code>style.css</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'no_style',
+ sprintf(
+ /* translators: %s: style.css */
+ __( 'The zip file must include a file named %s.', 'wporg-themes' ),
+ '<code>style.css</code>'
+ )
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style_errors = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors = new WP_Error;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Do we have a readme.txt? Fetch extra data from there too.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->readme = $this->get_readme_data( $theme_files );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,10 +214,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We need a screen shot. People love screen shots.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->has_screenshot( $theme_files ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: screenshot.png, 2: screenshot.jpg */
- $style_errors[] = sprintf( __( 'The zip file must include a file named %1$s or %2$s.', 'wporg-themes' ),
- '<code>screenshot.png</code>',
- '<code>screenshot.jpg</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add(
+ 'no_screenshot',
+ sprintf(
+ /* translators: 1: screenshot.png, 2: screenshot.jpg */
+ __( 'The zip file must include a file named %1$s or %2$s.', 'wporg-themes' ),
+ '<code>screenshot.png</code>',
+ '<code>screenshot.jpg</code>'
+ )
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,22 +239,27 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: comment header line, 2: style.css, 3: wporg URL */
- $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' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error .= sprintf(
+ /* translators: 1: comment header line, 2: style.css, 3: wporg URL */
+ __( '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' ),
</ins><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><span class="cx" style="display: block; padding: 0 10px"> __( 'https://developer.wordpress.org/themes/basics/main-stylesheet-style-css/', 'wporg-themes' )
</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">- $style_errors[] = $error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add( 'no_name', $error );
</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"> // Do not allow themes with WordPress and Theme in the theme name.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $this->theme_slug, 'wordpress' ) || preg_match( '/\btheme\b/i', $this->theme_slug ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: 'WordPress', 2: 'theme' */
- $style_errors[] = sprintf( __( 'You cannot use %1$s or %2$s in your theme name.', 'wporg-themes' ),
- 'WordPress',
- 'theme'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add(
+ 'invalid_name',
+ sprintf(
+ /* translators: 1: 'WordPress', 2: 'theme' */
+ __( 'You cannot use %1$s or %2$s in your theme name.', 'wporg-themes' ),
+ 'WordPress',
+ 'theme'
+ )
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,10 +269,14 @@
</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><span class="cx" style="display: block; padding: 0 10px"> // This check must be run before `get_theme_post()` to account for "twenty" themes.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->has_reserved_slug() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: theme slug, 2: style.css */
- $style_errors[] = sprintf( __( 'Sorry, the theme name %1$s is reserved for use by WordPress Core. Please change the name of your theme in %2$s and upload it again.', 'wporg-themes' ),
- '<code>' . $this->theme_slug . '</code>',
- '<code>style.css</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add(
+ 'reserved_slug',
+ sprintf(
+ /* translators: 1: theme slug, 2: style.css */
+ __( 'Sorry, the theme name %1$s is reserved for use by WordPress Core. Please change the name of your theme in %2$s and upload it again.', 'wporg-themes' ),
+ '<code>' . $this->theme_slug . '</code>',
+ '<code>style.css</code>'
+ )
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,45 +287,52 @@
</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="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: comment header line, 2: style.css, 3: wporg URL */
- $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' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error .= sprintf(
+ /* translators: 1: comment header line, 2: style.css, 3: wporg URL */
+ __( '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' ),
</ins><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><span class="cx" style="display: block; padding: 0 10px"> __( 'https://developer.wordpress.org/themes/basics/main-stylesheet-style-css/', 'wporg-themes' )
</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">- $style_errors[] = $error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add( 'no_description', $error );
</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"> if ( ! $this->theme->get( 'Tags' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'The theme has no tags.', 'wporg-themes' ) . ' ';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: comment header line, 2: style.css, 3: wporg URL */
- $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' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error .= sprintf(
+ /* translators: 1: comment header line, 2: style.css, 3: wporg URL */
+ __( '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' ),
</ins><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><span class="cx" style="display: block; padding: 0 10px"> __( 'https://developer.wordpress.org/themes/basics/main-stylesheet-style-css/', 'wporg-themes' )
</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">- $style_errors[] = $error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add( 'no_tags', $error );
</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"> if ( ! $this->theme->get( 'Version' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'The theme has no version.', 'wporg-themes' ) . ' ';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: comment header line, 2: style.css, 3: wporg URL */
- $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' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error .= sprintf(
+ /* translators: 1: comment header line, 2: style.css, 3: wporg URL */
+ __( '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' ),
</ins><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><span class="cx" style="display: block; padding: 0 10px"> __( 'https://developer.wordpress.org/themes/basics/main-stylesheet-style-css/', 'wporg-themes' )
</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">- $style_errors[] = $error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add( 'no_version', $error );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( preg_match( '|[^\d\.]|', $this->theme->get( 'Version' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: style.css */
- $style_errors[] = sprintf( __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix your Version: line in %s and upload your theme again.', 'wporg-themes' ),
- '<code>style.css</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add(
+ 'invalid_version',
+ sprintf(
+ /* translators: %s: style.css */
+ __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix your Version: line in %s and upload your theme again.', 'wporg-themes' ),
+ '<code>style.css</code>'
+ )
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,15 +341,22 @@
</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="cx" style="display: block; padding: 0 10px"> $authoruri = $this->theme->get( 'AuthorURI' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $themeuri ) && !empty( $authoruri ) && $themeuri == $authoruri ) {
- $style_errors[] = __( 'Duplicate theme and author URLs. A theme URL is a page/site that provides details about this specific theme. An author URL is a page/site that provides information about the author of the theme. You aren’t required to provide both, so pick the one that best applies to your URL.', 'wporg-themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $themeuri ) && ! empty( $authoruri ) && $themeuri == $authoruri ) {
+ $style_errors->add(
+ 'duplicate_uris',
+ __( 'Duplicate theme and author URLs. A theme URL is a page/site that provides details about this specific theme. An author URL is a page/site that provides information about the author of the theme. You aren’t required to provide both, so pick the one that best applies to your URL.', '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"> // Check for child theme's parent in the directory (non-buddypress only)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->theme->parent() && ! in_array( 'buddypress', $this->theme->get( 'Tags' ) ) && ! $this->is_parent_available() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: parent theme */
- $style_errors[] = sprintf( __( 'There is no theme called %s in the directory. For child themes, you must use a parent theme that already exists in the directory.', 'wporg-themes' ),
- '<code>' . $this->theme->parent() . '</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add(
+ 'invalid_parent',
+ sprintf(
+ /* translators: %s: parent theme */
+ __( 'There is no theme called %s in the directory. For child themes, you must use a parent theme that already exists in the directory.', 'wporg-themes' ),
+ '<code>' . $this->theme->parent() . '</code>'
+ )
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,10 +386,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $is_allowed_to_upload_for_theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: theme slug, 2: style.css */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style_errors[] = 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' ),
- '<code>' . $this->theme_slug . '</code>',
- '<code>style.css</code>'
- ) . $are_you_in_the_right_place;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add(
+ 'cannot_upload_theme',
+ 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' ),
+ '<code>' . $this->theme_slug . '</code>',
+ '<code>style.css</code>'
+ ) . $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><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,35 +413,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_owners = wp_list_pluck( $theme_uri_matches, 'post_author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme_owners && ! in_array( $this->author->ID, $theme_owners ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style_errors[] = 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 URL of your theme in %2$s and upload it again.', 'wporg-themes' ),
- '<code>' . esc_html( $themeuri ) . '</code>',
- '<code>style.css</code>'
- ) . $are_you_in_the_right_place;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add(
+ 'invalid_theme_uri',
+ 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 URL of your theme in %2$s and upload it again.', 'wporg-themes' ),
+ '<code>' . esc_html( $themeuri ) . '</code>',
+ '<code>style.css</code>'
+ ) . $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><span class="cx" style="display: block; padding: 0 10px">
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: mailto link */
- $style_errors[] = sprintf( __( 'This theme is suspended from the Theme Repository and it can’t be updated. If you have any questions about this please contact %s.', 'wporg-themes' ),
- '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $style_errors->add(
+ 'suspended',
+ sprintf(
+ /* translators: %s: mailto link */
+ __( 'This theme is suspended from the Theme Repository and it can’t be updated. If you have any questions about this please contact %s.', 'wporg-themes' ),
+ '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
+ )
</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">
</span><span class="cx" style="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.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->theme_post ) && ! version_compare( $this->theme->get( 'Version' ), $this->theme_post->max_version, '>' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: theme name, 2: theme version, 3: style.css */
- $style_errors[] = 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">+ $style_errors->add(
+ 'invalid_version',
+ sprintf(
+ /* translators: 1: theme name, 2: theme version, 3: style.css */
+ __( '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"> );
</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 we had any issues with information in the style.css, exit early.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $style_errors ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $style_errors->has_errors() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $style_errors;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,10 +465,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Log it to slack.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->log_to_slack( 'blocked' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Theme Check Plugin URL, 2: make.wordpress.org/themes */
- return sprintf( __( 'Your theme has failed the theme check. Please correct the problems with it and upload it again. You can also use the <a href="%1$s">Theme Check Plugin</a> to test your theme before uploading. If you have any questions about this please post them to %2$s.', 'wporg-themes' ),
- '//wordpress.org/plugins/theme-check/',
- '<a href="https://make.wordpress.org/themes">https://make.wordpress.org/themes</a>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'failed_theme_check',
+ sprintf(
+ /* translators: 1: Theme Check Plugin URL, 2: make.wordpress.org/themes */
+ __( 'Your theme has failed the theme check. Please correct the problems with it and upload it again. You can also use the <a href="%1$s">Theme Check Plugin</a> to test your theme before uploading. If you have any questions about this please post them to %2$s.', 'wporg-themes' ),
+ '//wordpress.org/plugins/theme-check/',
+ '<a href="https://make.wordpress.org/themes">https://make.wordpress.org/themes</a>'
+ )
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,9 +483,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a new version in SVN.
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->add_to_svn();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $result ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: mailto link */
- return sprintf( __( 'There was an error adding your theme to SVN. Please try again, if this error persists report the error to %s.', 'wporg-themes' ),
- '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'failed_to_add_to_svn',
+ sprintf(
+ /* translators: %s: mailto link */
+ __( 'There was an error adding your theme to SVN. Please try again, if this error persists report the error to %s.', 'wporg-themes' ),
+ '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
+ )
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,9 +503,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Since it's been added to SVN at this point, remove it from SVN to prevent future issues.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->remove_from_svn( 'Trac ticket creation failed.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: mailto link */
- return sprintf( __( 'There was an error creating a Trac ticket for your theme, please report this error to %s', 'wporg-themes' ),
- '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'failed_to_create_trac_ticket',
+ sprintf(
+ /* translators: %s: mailto link */
+ __( 'There was an error creating a Trac ticket for your theme, please report this error to %s', 'wporg-themes' ),
+ '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
+ )
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,8 +528,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->trigger_e2e_run();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Success!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: theme name, 2: Trac ticket URL */
- return sprintf( __( 'Thank you for uploading %1$s to the WordPress Theme Directory. We’ve sent you an email verifying that we’ve received it. Feedback will be provided at <a href="%2$s">%2$s</a>', 'wporg-themes' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sprintf(
+ /* translators: 1: theme name, 2: Trac ticket URL */
+ __( 'Thank you for uploading %1$s to the WordPress Theme Directory. We’ve sent you an email verifying that we’ve received it. Feedback will be provided at <a href="%2$s">%2$s</a>', 'wporg-themes' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->theme->display( 'Name' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( 'https://themes.trac.wordpress.org/ticket/' . $ticket_id )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryuploadphp"></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/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/upload.php 2021-08-12 06:54:30 UTC (rev 11175)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php 2021-08-13 02:25:40 UTC (rev 11176)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,22 +44,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notice = '';
</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 ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-themes-upload' ) && 'upload' === $_POST['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ ! empty( $_POST['_wpnonce'] ) &&
+ wp_verify_nonce( $_POST['_wpnonce'], 'wporg-themes-upload' ) &&
+ 'upload' === $_POST['action']
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages = wporg_themes_process_upload();
</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 ( ! empty( $messages ) ) {
- $notice_content = "";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice_content = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_array( $messages ) ) {
- foreach ( $messages as $message){
- $notice_content .= "<li>{$message}</li>";
- }
- } else {
- $notice_content = "<li>{$messages}</li>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $messages ) ) {
+ foreach ( $messages->get_error_codes() as $code ) {
+ $message = $messages->get_error_message( $code );
+ $notice_content .= "<li class='error-code-{$code}'>{$message}</li>";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $notice_content = "<li>{$messages}</li>";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notice = "<div class='notice notice-warning notice-large'><ul>{$notice_content}</ul></div>";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice = "<div class='notice notice-warning notice-large'><ul>{$notice_content}</ul></div>";
</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"> $form = '<h2>' . __( 'Select your zipped theme file', 'wporg-themes' ) . '</h2>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,22 +82,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Runs basic checks and hands off to the upload processor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Failure or success message.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Error|string Failure or success message.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_process_upload( ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return __( 'You must be logged in to upload a new theme.', 'wporg-themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'not_logged_in',
+ __( 'You must be logged in to upload a new theme.', '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"> if ( empty( $_FILES['zip_file'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return __( 'Error in file upload.', 'wporg-themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'invalid_upload',
+ __( 'Error in file upload.', '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"> if ( ! class_exists( 'WPORG_Themes_Upload' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- include_once plugin_dir_path( __FILE__ ) . 'class-wporg-themes-upload.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ include_once __DIR__ . '/class-wporg-themes-upload.php';
</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">- $upload = new WPORG_Themes_Upload;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upload = new WPORG_Themes_Upload;
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = $upload->process_upload( $_FILES['zip_file'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $message;
</span></span></pre>
</div>
</div>
</body>
</html>