Changeset 4483

Timestamp:

12/04/2016 10:10:02 PM (8 years ago)

Author:

dd32

Message:

Theme Directory: Move the hacky code in [4482] into a function and attach to the description, rather than as an extra comment.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -282 +282 @@
                 '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
             );
-        }
-
-        /*
-         * 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
-                );
-            }
         }
 
@@ -603 +561 @@
 [[Image(https://themes.svn.wordpress.org/{$this->theme_slug}/{$this->theme->display( 'Version' )}/{$this->theme->screenshot}, width=640)]]
 TICKET;
-    }
+
+        $theme_check_results = $this->generate_themecheck_results_for_trac();
+        if ( $theme_check_results ) {
+            $this->trac_ticket->description .= "\nTheme Check Results:\n" . $theme_check_results;
+        }
+        
+    }
+
+    /*
+     * 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 );
+    }
+
 
     /**