| @@ -248,8 +248,12 @@ | ||
| 248 | 248 | |
| 249 | 249 | // Single and a match |
| 250 | 250 | if ( is_singular( bbp_get_topic_post_type() ) || bbp_is_query_name( 'bbp_single_topic' ) ) { |
| 251 | 251 | $retval = true; |
| 252 | + | |
| 253 | + // Theme-compat / shortcode has already primed the topic being rendered. | |
| 254 | + } elseif ( ! empty( bbpress()->current_topic_id ) ) { | |
| 255 | + $retval = true; | |
| 252 | 256 | } |
| 253 | 257 | |
| 254 | 258 | // Filter & return |
| 255 | 259 | return (bool) apply_filters( 'bbp_is_single_topic', $retval ); |
