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

Timestamp:

06/07/2017 07:19:43 PM (8 years ago)

Author:

coreymckrill

Message:

WordCamp Post Types: Fix sanitization of [speakers] params

In r5545 and r5546 some changes were made to the speakers shortcode
to enable a track and a groups parameter, both of which accept
a comma-separated list of term slugs. To sanitize these parameters,
the values went through an array map that trimmed whitespace. The
unintended side effect of this was that if the parameter wasn't
included in the shortcode, the sanitization would set the default value
to a non-empty array containing an empty string. This in turn caused
a tax_query parameter to be added to the WP_Query args, and the
shortcode would return an empty list for the speakers.

It turns out that trimming the whitespace isn't necessary for this case,
but removing empty array items is, so the array_map was swapped out
for array_filter. This seems to fix the empty speaker list issue, and
shortcodes using track or groups can include whitespace in their
comma-separated lists without a problem.

File:

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

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

@@ -280 +280 @@
             'orderby'        => 'date',
             'order'          => 'desc',
+            'speaker_link'   => '',
             'track'          => '',
-            'speaker_link'   => '',
             'groups'         => '',
         ), $attr );
 
-        foreach ( array( 'orderby', 'order', 'track', 'speaker_link' ) as $key_for_case_sensitive_value ) {
+        foreach ( array( 'orderby', 'order', 'speaker_link' ) as $key_for_case_sensitive_value ) {
             $attr[ $key_for_case_sensitive_value ] = strtolower( $attr[ $key_for_case_sensitive_value ] );
         }
@@ -293 +293 @@
         $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'] : '';
-        $attr['track']        = array_map( 'trim', explode( ',', $attr['track'] ) );
-        $attr['groups']       = array_map( 'trim', explode( ',', $attr['groups'] ) );
+        $attr['track']        = array_filter( explode( ',', $attr['track'] ) );
+        $attr['groups']       = array_filter( explode( ',', $attr['groups'] ) );
 
         // Fetch all the relevant sessions