Changeset 10243

Timestamp:

09/09/2020 09:53:10 PM (4 years ago)

Author:

tellyworth

Message:

Theme directory: revert r10240 to test for trac issues.

This might have been related to ticket creation issues, reverting will help confirm.

See #5362

Location:

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

Files:

• admin-edit.php (modified) (5 diffs)
• class-themes-api.php (modified) (1 diff)
• class-wporg-themes-upload.php (modified) (1 diff)
• query-modifications.php (modified) (1 diff)
• theme-directory.php (modified) (1 diff)

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

@@ -44 +44 @@
         'label_count'         => _n_noop( 'Suspended <span class="count">(%s)</span>', 'Suspended <span class="count">(%s)</span>', 'wporg-themes' ),
     ) );
-
-    // Themes can be "delisted" to hide them from search, but allow them to be uploaded.
-    register_post_status( 'delist', array(
-        'label'               => __( 'Delisted', 'wporg-themes' ),
-        'protected'           => false,
-        'public'              => true,
-        'exclude_from_search' => true,
-        'label_count'         => _n_noop( 'Delisted <span class="count">(%s)</span>', 'Delisted <span class="count">(%s)</span>', 'wporg-themes' ),
-    ) );
 }
 add_action( 'init', 'wporg_themes_post_status' );
@@ -134 +125 @@
     }
 
-    if ( current_user_can( 'suspend_theme', $post->ID ) && 'publish' == $post->post_status ) {
-        $links[] = sprintf( '<a class="submit-delist_theme submitdelete" title="%1$s" href="%2$s">%3$s</a>', esc_attr__( 'Delist this item', 'wporg-themes' ), esc_url( wporg_themes_get_delist_url( $post ) ), __( 'Delist', 'wporg-themes' ) );
-    }
-    elseif ( current_user_can( 'reinstate_theme', $post->ID ) && 'delist' == $post->post_status ) {
-        $links[] = sprintf( '<a class="submit-relist_theme" title="%1$s" href="%2$s">%3$s</a>', esc_attr__( 'Relist this item', 'wporg-themes' ), esc_url( wporg_themes_get_relist_url( $post ) ), __( 'Relist', 'wporg-themes' ) );
-    }
-
     if ( ! empty( $links ) ) {
         echo '<div class="misc-pub-section">' . implode( ' | ', $links ) . '</div>';
@@ -201 +185 @@
     wporg_themes_remove_wpthemescom( $post->post_name );
 
-    wp_redirect( add_query_arg( 'suspended', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'reinstated', 'delisted', 'relisted' ), wp_get_referer() ) ) );
+    wp_redirect( add_query_arg( 'suspended', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'reinstated' ), wp_get_referer() ) ) );
     exit();
 }
@@ -244 +228 @@
     add_post_meta( $post_id, '_wporg_themes_reinstated', true );
 
-    wp_redirect( add_query_arg( 'reinstated', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'suspended', 'delisted', 'relisted' ), wp_get_referer() ) ) );
+    wp_redirect( add_query_arg( 'reinstated', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'suspended' ), wp_get_referer() ) ) );
     exit();
 }
 add_filter( 'admin_action_reinstate', 'wporg_themes_reinstate_theme' );
-
-/**
- * Action link to delist a theme.
- *
- * @param WP_Post $post
- * @return string URL
- */
-function wporg_themes_get_delist_url( $post ) {
-    return wp_nonce_url( add_query_arg( 'action', 'delist', admin_url( sprintf( get_post_type_object( $post->post_type )->_edit_link, $post->ID ) ) ), "delist-post_{$post->ID}" );
-}
-
-/**
- * Action link to relist a theme.
- *
- * @param WP_Post $post
- * @return string URL
- */
-function wporg_themes_get_relist_url( $post ) {
-    return wp_nonce_url( add_query_arg( 'action', 'relist', admin_url( sprintf( get_post_type_object( $post->post_type )->_edit_link, $post->ID ) ) ), "relist-post_{$post->ID}" );
-}
-
-/**
- * Delist a theme.
- */
-function wporg_themes_delist_theme() {
-    $post_id = isset( $_GET['post'] ) ? (int) $_GET['post'] : 0;
-
-    if ( ! $post_id ) {
-        wp_redirect( admin_url( 'edit.php' ) );
-        exit();
-    }
-
-    check_admin_referer( 'delist-post_' . $post_id );
-
-    $post = get_post( $post_id );
-
-    if ( 'delist' == $post->post_status ) {
-        wp_die( __( 'This item has already been delisted.', 'wporg-themes' ) );
-    }
-
-    if ( ! get_post_type_object( $post->post_type ) ) {
-        wp_die( __( 'Unknown post type.', 'wporg-themes' ) );
-    }
-
-    if ( ! current_user_can( 'suspend_theme', $post_id ) || 'repopackage' != $post->post_type ) {
-        wp_die( __( 'You are not allowed to delist this item.', 'wporg-themes' ) );
-    }
-
-    wp_update_post( array(
-        'ID'          => $post_id,
-        'post_status' => 'delist',
-    ) );
-
-    wp_redirect( add_query_arg( 'delisted', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'reinstated', 'delisted', 'relisted' ), wp_get_referer() ) ) );
-    exit();
-}
-add_filter( 'admin_action_delist', 'wporg_themes_delist_theme' );
-
-/**
- * Reinstate a theme.
- */
-function wporg_themes_relist_theme() {
-    $post_id = isset( $_GET['post'] ) ? (int) $_GET['post'] : 0;
-
-    if ( ! $post_id ) {
-        wp_redirect( admin_url( 'edit.php' ) );
-        exit();
-    }
-
-    check_admin_referer( 'relist-post_' . $post_id );
-
-    $post = get_post( $post_id );
-
-    if ( 'delist' != $post->post_status ) {
-        wp_die( __( 'This item has already been relisted.', 'wporg-themes' ) );
-    }
-
-    if ( ! get_post_type_object( $post->post_type ) ) {
-        wp_die( __( 'Unknown post type.', 'wporg-themes' ) );
-    }
-
-    if ( ! current_user_can( 'reinstate_theme', $post_id ) || 'repopackage' != $post->post_type ) {
-        wp_die( __( 'You are not allowed to relist this item.', 'wporg-themes' ) );
-    }
-
-    wp_update_post( array(
-        'ID'          => $post_id,
-        'post_status' => 'publish',
-    ) );
-
-    wp_redirect( add_query_arg( 'relisted', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'suspended', 'delisted', 'relisted' ), wp_get_referer() ) ) );
-    exit();
-}
-add_filter( 'admin_action_relist', 'wporg_themes_relist_theme' );
 
 /**
@@ -371 +261 @@
 
         add_settings_error( 'wporg_themes', 'reinstated', sprintf( $message, $reinstated ), 'updated' );
-    }
-
-    elseif ( ! empty( $_GET['delisted'] ) ) {
-        $delisted = absint( $_GET['delisted'] );
-        $message    = _n( '%s theme delisted.', '%s themes delisted.', $delisted, 'wporg-themes' );
-
-        add_settings_error( 'wporg_themes', 'delisted', sprintf( $message, $delisted ) );
-    }
-    elseif ( ! empty( $_GET['relisted'] ) ) {
-        $relisted = absint( $_GET['relisted'] );
-        $message    = _n( '%s theme relisted.', '%s themes relisted.', $relisted, 'wporg-themes' );
-
-        add_settings_error( 'wporg_themes', 'relisted', sprintf( $message, $relisted ), 'updated' );
     }
 

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

@@ -447 +447 @@
                 'name'      => $this->request->slug,
                 'post_type' => 'repopackage',
-                'post_status' => 'publish,delist',
             ) );
 

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

@@ -488 +488 @@
              * if the uploading user doesn't have have the permission to view drafts.
              */
-            'post_status'      => array( 'publish', 'pending', 'draft', 'future', 'trash', 'suspend', 'delist' ),
+            'post_status'      => array( 'publish', 'pending', 'draft', 'future', 'trash', 'suspend' ),
             'suppress_filters' => false,
         ) );

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

@@ -37 +37 @@
     if ( !isset( $query->query_vars['post_status'] ) ) {
         $query->query_vars['post_status'] = 'publish';
-    }
-
-    if ( !empty( $query->query_vars['name'] ) ) {
-        $query->query_vars['post_status'] = 'publish,delist';
     }
 

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

@@ -1144 +1144 @@
                 $noindex = true;
             }
-        }
-
-        if ( !$noindex && 'delist' === $post->post_status ) {
-            $noindex = 'nosnippet';
         }
     }