<!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>[11174] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php: Theme Directory: Use the `trac_ticket` property for retrieving the ticket ID, rather than passing it to functions, just like all the other properties used.</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/11174">11174</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/11174","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-12 06:41:28 +0000 (Thu, 12 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: Use the `trac_ticket` property for retrieving the ticket ID, rather than passing it to functions, just like all the other properties used.</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 2021-08-12 06:27:15 UTC (rev 11173)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-08-12 06:41:28 UTC (rev 11174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,13 +449,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->trac_ticket->id = $ticket_id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Add a or update the Theme Directory entry for this theme.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->create_or_update_theme_post( $ticket_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->create_or_update_theme_post();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send theme author an email for peace of mind.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->send_email_notification( $ticket_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->send_email_notification();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'theme_upload', $this->theme, $this->theme_post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,7 +461,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->log_to_slack( 'allowed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Initiate a GitHub actions run for the theme.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->trigger_e2e_run( $ticket_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->trigger_e2e_run();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Success!
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: theme name, 2: Trac ticket URL */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -927,6 +925,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function create_or_update_trac_ticket() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up a way to communicate with Trac.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->trac ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! defined( 'THEME_TRACBOT_PASSWORD' ) ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'Trac' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-IXR.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -977,15 +979,15 @@
</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">+ $this->trac_ticket->id = $ticket_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $ticket_id;
</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><span class="cx" style="display: block; padding: 0 10px"> * Creates or updates a theme post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @param int $ticket_id Trac ticket ID
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function create_or_update_theme_post( $ticket_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_or_update_theme_post() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $upload_date = current_time( 'mysql' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we already have a post, get its ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1018,7 +1020,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_requires' => $this->sanitize_version_like_field( $this->theme->get( 'RequiresWP' ), 'requires' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_requires_php' => $this->sanitize_version_like_field( $this->theme->get( 'RequiresPHP' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_upload_date' => $upload_date,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '_ticket_id' => $ticket_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '_ticket_id' => $this->trac_ticket->id ?? 0,
</ins><span class="cx" style="display: block; padding: 0 10px"> '_screenshot' => $this->theme->screenshot,
</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">@@ -1034,7 +1036,9 @@
</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"> // Add an additional row with the trac ticket ID, to make it possible to find the post by this ID later.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_post_meta( $post_id, sanitize_key( '_trac_ticket_' . $this->theme->get( 'Version' ) ), $ticket_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_meta['_ticket_id'] ) {
+ add_post_meta( $post_id, sanitize_key( '_trac_ticket_' . $this->theme->get( 'Version' ) ), $post_meta['_ticket_id'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Discard versions that are awaiting review, and maybe set this upload as live.
</span><span class="cx" style="display: block; padding: 0 10px"> $version_status = 'new';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,6 +1054,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This attempts to do a SVN copy to allow for simpler diff views, but falls back to a svn import as an error condition.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_to_svn() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! defined( 'THEME_DROPBOX_PASSWORD' ) || ! THEME_DROPBOX_PASSWORD ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Either new theme upload, or we don't have the needed variables to copy it directly.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->theme_post ) || empty( $this->theme_post->max_version ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->add_to_svn_via_svn_import();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1111,7 +1119,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Add the theme files to SVN via svn import.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function add_to_svn_via_svn_import() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_to_svn_via_svn_import() {
+ if ( ! defined( 'THEME_DROPBOX_PASSWORD' ) || ! THEME_DROPBOX_PASSWORD ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $import_msg = empty( $this->theme_post ) ? 'New theme: %1$s - %2$s' : 'New version of %1$s - %2$s'; // Intentionally not translated
</span><span class="cx" style="display: block; padding: 0 10px"> $import_msg = escapeshellarg( sprintf( $import_msg, $this->theme->display( 'Name' ), $this->theme->display( 'Version' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $svn_path = escapeshellarg( "https://themes.svn.wordpress.org/{$this->theme_slug}/{$this->theme->display( 'Version' )}" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1131,7 +1143,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Remove a theme version commited to SVN.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function remove_from_svn( $reason ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function remove_from_svn( $reason ) {
+ if ( ! defined( 'THEME_DROPBOX_PASSWORD' ) || ! THEME_DROPBOX_PASSWORD ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $svn_path = "{$this->theme_slug}/{$this->theme->display( 'Version' )}";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->theme_slug || ! $this->theme->display( 'Version' ) || strlen( $svn_path ) < 3 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1149,10 +1165,8 @@
</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"> * Sends out an email confirmation to the theme's author.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @param int $ticket_id Trac ticket ID
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function send_email_notification( $ticket_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function send_email_notification() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->theme_post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,7 +1194,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> https://make.wordpress.org/themes', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme->display( 'Version' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme->display( 'Name' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'https://themes.trac.wordpress.org/ticket/' . $ticket_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'https://themes.trac.wordpress.org/ticket/' . $this->trac_ticket->id
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: theme name */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1222,7 +1236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Thank you.
</span><span class="cx" style="display: block; padding: 0 10px"> The WordPress Theme Review Team', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme->display( 'Name' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'https://themes.trac.wordpress.org/ticket/' . $ticket_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'https://themes.trac.wordpress.org/ticket/' . $this->trac_ticket->id
</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">@@ -1242,7 +1256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Triggers a GitHub actions run for the 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">- public function trigger_e2e_run( $ticket_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function trigger_e2e_run() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $api = GitHub::api(
</span><span class="cx" style="display: block; padding: 0 10px"> '/repos/' . WPORG_THEMES_E2E_REPO . '/dispatches',
</span><span class="cx" style="display: block; padding: 0 10px"> json_encode([
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1256,7 +1270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_slug' => $this->theme_slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_zip' => "https://wordpress.org/themes/download/{$this->theme_slug}.{$this->theme->display( 'Version' )}.zip?nostats=1",
</span><span class="cx" style="display: block; padding: 0 10px"> 'accessible_ready' => in_array( 'accessibility-ready', $this->theme->get( 'Tags' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'trac_ticket_id' => $ticket_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'trac_ticket_id' => $this->trac_ticket->id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'trac_priority' => $this->trac_ticket->priority,
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> ])
</span></span></pre>
</div>
</div>
</body>
</html>