Changeset 1295

Timestamp:

02/23/2015 11:42:33 PM (10 years ago)

Author:

iandunn

Message:

WordCamp Post Types: Prevent duplicate avatars on [speakers] page.

r933 and r935 added functionality to display extra information on single speaker/session posts, and attempted to make sure that it only appeared on those posts by checking $post->post_type.

That resulted in a bug where the extra info would also be added to regular pages that contained the [speakers] or [sessions] shortcodes, because in that context $post would refer to the current post in the secondary loop, rather than the page from the main loop.

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

@@ -1059 +1059 @@
 
     /**
+     * Determine if the current loop is just a single page, or a loop of posts within a page
+     *
+     * For example, this helps to target a single wcb_speaker post vs a page containing the [speakers] shortcode,
+     * which loops through wcb_speaker posts. Using functions like is_single() don't work, because they reference
+     * the main query instead of the $speakers query.
+     *
+     * @param string $post_type
+     *
+     * @return bool
+     */
+    protected function is_single_cpt_post( $post_type ) {
+        global $wp_query;
+
+        return isset( $wp_query->query[ $post_type ] ) && $post_type == $wp_query->query['post_type'];
+    }
+
+    /**
      * Add the speaker's avatar to their post
      *
@@ -1072 +1089 @@
         $enabled_site_ids = apply_filters( 'wcpt_speaker_post_avatar_enabled_site_ids', array( 364 ) );    // 2014.sf
 
-        if ( 'wcb_speaker' !== $post->post_type ) {
+        if ( ! $this->is_single_cpt_post( 'wcb_speaker') ) {
             return $content;
         }
@@ -1100 +1117 @@
         $enabled_site_ids = apply_filters( 'wcpt_session_post_speaker_info_enabled_site_ids', array( 364 ) );    // 2014.sf
 
-        if ( 'wcb_session' !== $post->post_type ) {
+        if ( ! $this->is_single_cpt_post( 'wcb_session') ) {
             return $content;
         }
@@ -1165 +1182 @@
         $enabled_site_ids = apply_filters( 'wcpt_speaker_post_session_info_enabled_site_ids', array( 364 ) );    // 2014.sf
 
-        if ( 'wcb_speaker' !== $post->post_type ) {
+        if ( ! $this->is_single_cpt_post( 'wcb_speaker') ) {
             return $content;
         }