Changeset 1397

Timestamp:

03/13/2015 12:04:27 PM (10 years ago)

Author:

obenland

Message:

WP.org Themes: Don't update theme post until new version was approved.

Theme description and tags might change in new versions, so the post can't be
updated with that new information until that version has been approved.

This also fixes a bug where the post date would be set to the upload date of
the new version, mixing new themes with updated themes in the Latest Themes
view in the Directory.

Fixes #943.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory

Files:

• admin-edit.php (modified) (1 diff)
• class-wporg-themes-upload.php (modified) (1 diff)
• theme-directory.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/admin-edit.php

@@ -392 +392 @@
     }
 
+    // Only run once.
+    remove_action( 'save_post', __FUNCTION__ );
+
     $new_status = array();
     foreach ( $_POST['wporg_themes_status'] as $version => $status ) {

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

@@ -525 +525 @@
     public function create_or_update_theme_post( $ticket_id ) {
         $upload_date = current_time( 'mysql' );
-        $post_args   = array(
-            'post_author'    => $this->author->ID,
-            'post_title'     => $this->theme->get( 'Name' ),
-            'post_name'      => $this->theme_slug,
-            'post_content'   => $this->theme->get( 'Description' ),
-            'post_parent'    => $this->theme->post_parent,
-            'post_date'      => $upload_date,
-            'comment_status' => 'closed',
-            'ping_status'    => 'closed',
-            'post_type'      => 'repopackage',
-            'tags_input'     => $this->theme->get( 'Tags' ),
-        );
-
-        // If we already have a post, update it.
+
+        // If we already have a post, get its ID.
         if ( ! empty( $this->theme_post ) ) {
-            $post_args['ID'] = $this->theme_post->ID;
-
-            $post_id = wp_update_post( $post_args );
-
-            // Otherwise create it for this new theme.
+            $post_id = $this->theme_post->ID;
+
+        // Otherwise create it for this new theme.
         } else {
-            $post_id = wp_insert_post( $post_args );
+            $post_id = wp_insert_post( array(
+                'post_author'    => $this->author->ID,
+                'post_title'     => $this->theme->get( 'Name' ),
+                'post_name'      => $this->theme_slug,
+                'post_content'   => $this->theme->get( 'Description' ),
+                'post_parent'    => $this->theme->post_parent,
+                'post_date'      => $upload_date,
+                'post_date_gmt'  => $upload_date,
+                'comment_status' => 'closed',
+                'ping_status'    => 'closed',
+                'post_type'      => 'repopackage',
+                'tags_input'     => $this->theme->get( 'Tags' ),
+            ) );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php

@@ -339 +339 @@
     wporg_themes_update_wpthemescom( $post->post_name, $version );
 
+    // Update the post with this version's description and tags.
+    $theme_data = wporg_themes_get_header_data( sprintf( 'https://themes.svn.wordpress.org/%1$s/%2$s/style.css', $post->post_name, $version ) );
+    wp_update_post( array(
+        'ID'           => $post_id,
+        'post_content' => $theme_data['Description'],
+        'tags_input'   => $theme_data['Tags'],
+    ) );
+
     /*
      * Bail if we're activating an old version, the author does not need to be
@@ -499 +507 @@
     }
 }
+
+/**
+ * Custom version of core's deprecated `get_theme_data()` function.
+ *
+ * @param string $theme_file Path to the file.
+ * @return array File headers.
+ */
+function wporg_themes_get_header_data( $theme_file ) {
+    $themes_allowed_tags = array(
+        'a'       => array(
+            'href'  => array(),
+            'title' => array(),
+        ),
+        'abbr'    => array(
+            'title' => array(),
+        ),
+        'acronym' => array(
+            'title' => array(),
+        ),
+        'code'    => array(),
+        'em'      => array(),
+        'strong'  => array(),
+    );
+
+    $theme_data = implode( '', file( $theme_file ) );
+    $theme_data = str_replace( '\r', '\n', $theme_data );
+    preg_match( '|^[ \t\/*#@]*Theme Name:(.*)$|mi', $theme_data, $theme_name );
+    preg_match( '|^[ \t\/*#@]*Theme URI:(.*)$|mi', $theme_data, $theme_uri );
+    preg_match( '|^[ \t\/*#@]*Description:(.*)$|mi', $theme_data, $description );
+
+    if ( preg_match( '|^[ \t\/*#@]*Author URI:(.*)$|mi', $theme_data, $author_uri ) ) {
+        $author_uri = esc_url( trim( $author_uri[1] ) );
+    } else {
+        $author_uri = '';
+    }
+
+    if ( preg_match( '|^[ \t\/*#@]*Template:(.*)$|mi', $theme_data, $template ) ) {
+        $template = wp_kses( trim( $template[1] ), $themes_allowed_tags );
+    } else {
+        $template = '';
+    }
+
+    if ( preg_match( '|^[ \t\/*#@]*Version:(.*)$|mi', $theme_data, $version ) ) {
+        $version = wp_kses( trim( $version[1] ), $themes_allowed_tags );
+    } else {
+        $version = '';
+    }
+
+    if ( preg_match( '|^[ \t\/*#@]*Status:(.*)$|mi', $theme_data, $status ) ) {
+        $status = wp_kses( trim( $status[1] ), $themes_allowed_tags );
+    } else {
+        $status = 'publish';
+    }
+
+    if ( preg_match( '|^[ \t\/*#@]*Tags:(.*)$|mi', $theme_data, $tags ) ) {
+        $tags = array_map( 'trim', explode( ',', wp_kses( trim( $tags[1] ), array() ) ) );
+    } else {
+        $tags = array();
+    }
+
+    if ( preg_match( '|^[ \t\/*#@]*Author:(.*)$|mi', $theme_data, $author_name ) ) {
+        $author = wp_kses( trim( $author_name[1] ), $themes_allowed_tags );
+    } else {
+        $author = 'Anonymous';
+    }
+
+    $name        = $theme = wp_kses( trim( $theme_name[1] ), $themes_allowed_tags );
+    $theme_uri   = esc_url( trim( $theme_uri[1] ) );
+    $description = wp_kses( trim( $description[1] ), $themes_allowed_tags );
+
+    return array(
+        'Name'        => $name,
+        'Title'       => $theme,
+        'URI'         => $theme_uri,
+        'Description' => $description,
+        'Author'      => $author,
+        'Author_URI'  => $author_uri,
+        'Version'     => $version,
+        'Template'    => $template,
+        'Status'      => $status,
+        'Tags'        => $tags,
+    );
+}