Changeset 5545

Timestamp:

06/06/2017 07:40:01 PM (8 years ago)

Author:

coreymckrill

Message:

WordCamp Post Types: Enable and clean up track param for [speakers]

The track parameter for the speakers shortcode was experimentally
added for a single camp in 2014, but was never fully enabled. This
commit removes the restriction to the single camp, and adds some extra
sanitization to the parameter value before adding it to the sessions
query.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php (modified) (4 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php

@@ -280 +280 @@
             'orderby'        => 'date',
             'order'          => 'desc',
-            'track'          => 'all',
+            'track'          => '',
             'speaker_link'   => '',
         ), $attr );
@@ -292 +292 @@
         $attr['order']        = in_array( $attr['order'],        array( 'asc', 'desc'           ) ) ? $attr['order']        : 'desc';
         $attr['speaker_link'] = in_array( $attr['speaker_link'], array( 'permalink'             ) ) ? $attr['speaker_link'] : '';
-
-        /*
-         * Only allow 2014.capetown to use the new track attribute
-         * @todo Remove this and update docs after stakeholder review
-         */
-        if ( ! in_array( get_current_blog_id(), apply_filters( 'wcpt_filter_speakers_by_track_allowed_sites', array( 423 ) ) ) ) {
-            $attr['track'] = 'all';
-        }
+        $attr['track']        = array_map( 'trim', explode( ',', $attr['track'] ) );
 
         // Fetch all the relevant sessions
@@ -307 +300 @@
         );
 
-        if ( 'all' != $attr['track'] ) {
+        if ( ! empty( $attr['track'] ) ) {
             $session_args['tax_query'] = array(
                 array(
                     'taxonomy' => 'wcb_track',
                     'field'    => 'slug',
-                    'terms'    => explode( ',', $attr['track'] ),
+                    'terms'    => $attr['track'],
                 ),
             );
@@ -351 +344 @@
         );
 
-        if ( 'all' != $attr['track'] ) {
+        if ( ! empty( $attr['track'] ) ) {
             $speaker_args['post__in'] = $speaker_ids;
         }