<!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>[11229] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php: Theme Directory: Add a method to import a theme update from a SVN directory.</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/11229">11229</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/11229","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-09-14 06:09:50 +0000 (Tue, 14 Sep 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: Add a method to import a theme update from a SVN directory.
See <a href="http://meta.trac.wordpress.org/ticket/5899">#5899</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 2021-09-14 05:45:59 UTC (rev 11228)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2021-09-14 06:09:50 UTC (rev 11229)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,6 +200,60 @@
</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">+ * Process a theme update, from files that are already in SVN.
+ *
+ * @param string $slug The theme slug to process. Must exist.
+ * @param string $version The theme version to process. Must exist.
+ * @param int $changeset The SVN revision if known. Optional.
+ * @param string $author The SVN author if known. Optional.
+ * @return true|WP_Error See ::import() for error conditions.
+ */
+ public function process_update_from_svn( $slug, $version, $changeset = 0, $author = '' ) {
+ $this->reset_properties();
+
+ $this->theme_slug = $slug;
+
+ // Check out from SVN.
+ $this->create_tmp_dirs( $slug . '.' . $version );
+ $esc_svn = escapeshellarg( "https://themes.svn.wordpress.org/{$slug}/{$version}/" );
+ $this->exec_with_notify(
+ self::SVN . " export {$esc_svn} {$this->theme_dir} --force", // force as we've created the directory already.
+ $output,
+ $return_var
+ );
+ if ( $return_var ) {
+ return new WP_Error(
+ 'svn_error',
+ implode( "\n", $output )
+ );
+ }
+
+ // Fetch data from SVN if not known.
+ if ( ! $changeset ) {
+ $changeset = (int) trim( $this->exec_with_notify( self::SVN . " info --show-item=last-changed-revision {$esc_svn}" ) );
+ }
+ if ( ! $author ) {
+ $author = trim( $this->exec_with_notify( self::SVN . " info --show-item=last-changed-author {$esc_svn}" ) );
+ }
+
+ // Get the revision.
+ $this->trac_changeset = $changeset;
+
+ // Get the author.
+ if ( $author && 'themedropbox' !== $author ) {
+ $this->author = get_user_by( 'login', $author );
+ }
+
+ // The version should be set live as it's from SVN.
+ $this->version_status = 'live';
+
+ return $this->import( array( // return true | WP_Error
+ // Since this version is already in SVN, we shouldn't try to import it again.
+ 'commit_to_svn' => false,
+ ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Processes a theme ZIP upload.
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +271,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">- $this->create_tmp_dirs( $file_upload['name'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->create_tmp_dirs( $file_upload['name'], true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->unzip_package( $file_upload );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->import();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,7 +711,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Creates a temporary directory, and the theme dir within it.
</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 create_tmp_dirs( $base_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_tmp_dirs( $base_name, $create_svn_tmp = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Create a temporary directory if it doesn't exist yet.
</span><span class="cx" style="display: block; padding: 0 10px"> $tmp = self::TMP;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_dir( $tmp ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,11 +732,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get a sanitized name for that theme and create a directory for it.
</span><span class="cx" style="display: block; padding: 0 10px"> $base_name = $this->get_sanitized_zip_name( $base_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_dir = "{$this->tmp_dir}/{$base_name}";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->tmp_svn_dir = "{$this->tmp_dir}/svn";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->tmp_svn_dir = "{$this->tmp_dir}/"; // Set it to something, just in case.
</ins><span class="cx" style="display: block; padding: 0 10px"> mkdir( $this->theme_dir );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mkdir( $this->tmp_svn_dir );
</del><span class="cx" style="display: block; padding: 0 10px"> chmod( $this->theme_dir, 0777 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- chmod( $this->tmp_svn_dir, 0777 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $create_svn_tmp ) {
+ $this->tmp_svn_dir = "{$this->tmp_dir}/svn";
+ mkdir( $this->tmp_svn_dir );
+ chmod( $this->tmp_svn_dir, 0777 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure we clean up after ourselves.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'shutdown', array( $this, 'remove_files' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1376,7 +1433,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme->display( 'Version' )
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> $email_content = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: theme version, 2: theme name, 3: Trac ticket URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Thank you for uploading version %1$s of %2$s.
</span></span></pre>
</div>
</div>
</body>
</html>