Ticket #23421: 23421.diff

src/wp-includes/taxonomy.php

@@ -56 +56 @@
                 'public' => true,
                 'show_ui' => true,
                 'show_admin_column' => true,
+                'show_column_sortable' => true,
                 '_builtin' => true,
         ) );
 
@@ -66 +67 @@
                 'public' => true,
                 'show_ui' => true,
                 'show_admin_column' => true,
+                'show_column_sortable' => true,
                 '_builtin' => true,
         ) );
 
@@ -129 +131 @@
 add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
 
 /**
+ * Performs column sorting for taxonomies registered with 'show_column_sortable'.
+ * @since  4.0.0
+ * @param array    $clauses  The list of clauses for the query.
+ * @param WP_Query $wp_query The WP_Query instance (passed by reference).
+ *
+ * @return string Modified clauses
+ */
+function peform_sortable_taxonomy_columns_query( $clauses, $wp_query ) {
+        global $wpdb;
+
+        if ( ! isset( $wp_query->query['orderby'] ) ) {
+                return $clauses;
+        }
+
+        $taxonomies = get_sortable_taxonomies( $wp_query->query['post_type'] );
+
+        if ( empty( $taxonomies ) || ! is_array( $taxonomies ) ) {
+                return $clauses;
+        }
+
+        $sortable_taxonomies = array();
+        foreach ( $taxonomies as $taxonomy ) {
+                if ( 'category' == $taxonomy )
+                        $column_key = 'categories';
+                elseif ( 'post_tag' == $taxonomy )
+                        $column_key = 'tags';
+                else
+                        $column_key = 'taxonomy-' . $taxonomy;
+
+                $sortable_taxonomies[ $taxonomy ] = $column_key;
+        }
+
+        $key = array_search( $wp_query->query['orderby'], $sortable_taxonomies, true );
+
+        if ( false === $key ) {
+                return $clauses;
+        }
+
+        $clauses['join'] .= "
+                LEFT OUTER JOIN {$wpdb->term_relationships} ON {$wpdb->posts}.ID={$wpdb->term_relationships}.object_id
+                LEFT OUTER JOIN {$wpdb->term_taxonomy} USING (term_taxonomy_id)
+                LEFT OUTER JOIN {$wpdb->terms} USING (term_id)
+        ";
+        $clauses['where'] = $wpdb->prepare( " AND taxonomy = '%s'", $key );
+        $clauses['groupby'] = "object_id";
+        $clauses['orderby']  = "GROUP_CONCAT({$wpdb->terms}.name ORDER BY name ASC) ";
+        $clauses['orderby'] .= ( 'ASC' == strtoupper( $wp_query->get('order') ) ) ? 'ASC' : 'DESC';
+
+        return $clauses;
+}
+add_filter( 'posts_clauses', 'peform_sortable_taxonomy_columns_query', 10, 2 );
+
+/**
  * Get a list of registered taxonomy objects.
  *
  * @since 3.0.0
@@ -337 +392 @@
                 'show_in_nav_menus'     => null,
                 'show_tagcloud'         => null,
                 'show_admin_column'     => false,
+                'show_column_sortable'  => false,
                 'meta_box_cb'           => null,
                 'capabilities'          => array(),
                 'rewrite'               => true,
@@ -3931 +3987 @@
                 wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
 
         return $parent;
-}
- No newline at end of file
+}
+
+/**
+ * Get a list of all taxonomies registered as sortable.
+ * Passes through the "manage_taxonomies_for_{$post_type}_sortable_columns" filter.
+ *
+ * @since  4.0.0
+ * @param  string $post_type Post type to retrieve Taxonomies
+ *
+ * @return array Array of sortable taxonomies
+ */
+function get_sortable_taxonomies( $post_type ) {
+        $taxonomies = get_object_taxonomies( $post_type, 'objects' );
+        $taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true, 'show_column_sortable' => true ), 'and', 'name' );
+
+        /**
+         * Filter the sortable taxonomy columns in the Posts list table.
+         *
+         * The dynamic portion of the hook name, $post_type, refers to the post
+         * type slug.
+         *
+         * @since 3.5.0
+         *
+         * @param array  $taxonomies Array of taxonomies to enable sortable columns for.
+         * @param string $post_type  The post type.
+         */
+        $taxonomies = apply_filters( "manage_taxonomies_for_{$post_type}_sortable_columns", $taxonomies );
+        $taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+
+        return $taxonomies;
+}

src/wp-admin/includes/class-wp-posts-list-table.php

@@ -346 +346 @@
         }
 
         function get_sortable_columns() {
-                return array(
+                $sortables = array(
                         'title'    => 'title',
                         'parent'   => 'parent',
                         'comments' => 'comment_count',
                         'date'     => array( 'date', true )
                 );
+
+                $taxonomies = get_sortable_taxonomies( $this->screen->post_type );
+
+                if ( ! empty( $taxonomies ) && is_array( $taxonomies ) ) {
+                        foreach ( $taxonomies as $taxonomy ) {
+                                if ( 'category' == $taxonomy )
+                                        $column_key = 'categories';
+                                elseif ( 'post_tag' == $taxonomy )
+                                        $column_key = 'tags';
+                                else
+                                        $column_key = 'taxonomy-' . $taxonomy;
+
+                                $sortables[ $column_key ] = $column_key;
+                        }
+                }
+
+                return $sortables;
         }
 
         function display_rows( $posts = array(), $level = 0 ) {