<!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>[4483] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php: Theme Directory: Move the hacky code in [4482] into a function and attach to the description, rather than as an extra comment.</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 { 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/4483">4483</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/4483","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>2016-12-04 22:10:02 +0000 (Sun, 04 Dec 2016)</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 hacky code in <a href="http://meta.trac.wordpress.org/changeset/4482">[4482]</a> into a function and attach to the description, rather than as an extra comment.</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 2016-12-04 21:53:30 UTC (rev 4482)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2016-12-04 22:10:02 UTC (rev 4483)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,48 +283,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">- /*
- * Add a comment to the trac ticket with the results of the theme check, if any exists.
- */
- if ( !empty( $GLOBALS['themechecks'] ) ) {
- $tc_errors = $tc_results = array();
- foreach ( $GLOBALS['themechecks'] as $check ) {
- if ( $check instanceof \themecheck ) {
- $error = (array) $check->getError();
- if ( $error ) {
- $tc_errors = array_unique( array_merge( $tc_errors, $error ) );
- }
- }
- }
- if ( $tc_errors ) {
- foreach ( $tc_errors as $e ) {
- $trac_left = array( '<strong>', '</strong>' );
- $trac_right= array( "'''", "'''" );
- $html_link = '/<a\s?href\s?=\s?[\'|"]([^"|\']*)[\'|"]>([^<]*)<\/a>/i';
- $html_new = '[$1 $2]';
- $e = preg_replace( $html_link, $html_new, $e );
- $e = str_replace( $trac_left, $trac_right, $e );
- $e = preg_replace( '/<pre.*?>/', "\r\n{{{\r\n", $e );
- $e = str_replace( '</pre>', "\r\n}}}\r\n", $e );
-
- $e = preg_replace( '!<span class="[^"]+">([^<]+)</span>!', '$1', $e );
-
- if ( 'INFO' !== substr( $e, 0, 4 ) ) {
- $tc_results[] = '* ' . $e;
- }
- }
- }
-
- if ( $tc_results ) {
- $tc_results = implode( "\n", $tc_results );
-
- $this->trac->ticket_update(
- $ticket_id,
- "Theme Check Results:\n" . $tc_results
- );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Add a or update the Theme Directory entry for this theme.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->create_or_update_theme_post( $ticket_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,8 +560,59 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> [[Image(https://themes.svn.wordpress.org/{$this->theme_slug}/{$this->theme->display( 'Version' )}/{$this->theme->screenshot}, width=640)]]
</span><span class="cx" style="display: block; padding: 0 10px"> TICKET;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $theme_check_results = $this->generate_themecheck_results_for_trac();
+ if ( $theme_check_results ) {
+ $this->trac_ticket->description .= "\nTheme Check Results:\n" . $theme_check_results;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Add a comment to the trac ticket with the results of the theme check, if any exists.
+ */
+ public function generate_themecheck_results_for_trac() {
+ global $themechecks;
+ if ( empty( $themechecks ) ) {
+ return '';
+ }
+
+ $tc_errors = $tc_results = array();
+ foreach ( $themechecks as $check ) {
+ if ( $check instanceof \themecheck ) {
+ $error = (array) $check->getError();
+ if ( $error ) {
+ $tc_errors = array_unique( array_merge( $tc_errors, $error ) );
+ }
+ }
+ }
+
+ if ( $tc_errors ) {
+ foreach ( $tc_errors as $e ) {
+ $trac_left = array( '<strong>', '</strong>' );
+ $trac_right= array( "'''", "'''" );
+ $html_link = '/<a\s?href\s?=\s?[\'|"]([^"|\']*)[\'|"]>([^<]*)<\/a>/i';
+ $html_new = '[$1 $2]';
+ $e = preg_replace( $html_link, $html_new, $e );
+ $e = str_replace( $trac_left, $trac_right, $e );
+ $e = preg_replace( '/<pre.*?>/', "\r\n{{{\r\n", $e );
+ $e = str_replace( '</pre>', "\r\n}}}\r\n", $e );
+ $e = preg_replace( '!<span class="[^"]+">([^<]+)</span>!', '$1', $e );
+
+ if ( 'INFO' !== substr( $e, 0, 4 ) ) {
+ $tc_results[] = '* ' . $e;
+ }
+ }
+ }
+
+ if ( ! $tc_results ) {
+ return '';
+ }
+
+ return implode( "\n", $tc_results );
+ }
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Updates an existing Trac ticket or creates a new one.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>