Changeset 7175 for trunk/src/includes/topics/template.php

Timestamp:

01/03/2021 07:19:06 AM (4 years ago)

Author:

johnjamesjacoby

Message:

Theme Compatibility: improve handling of shortcodes in some template functions.

This commit swaps out is_page() || is_single() for is_singular() which is easier to understand, and also raises the priority of that conditional check inside bbp_get_topics_pagination_base(), allowing it to work as intended inside of topic views and tags shortcode usages.

In trunk for 2.7.0. See #3358.

File:

• trunk/src/includes/topics/template.php (modified) (2 diffs)

trunk/src/includes/topics/template.php

@@ -2912 +2912 @@
             $base = bbp_get_user_profile_url( bbp_get_displayed_user_id() );
 
+        // Any single post (for shortcodes, ahead of shortcodeables below)
+        } elseif ( is_singular() ) {
+            $base = get_permalink();
+
         // View
         } elseif ( bbp_is_single_view() ) {
@@ -2919 +2923 @@
         } elseif ( bbp_is_topic_tag() ) {
             $base = bbp_get_topic_tag_link();
-
-        // Page or single post
-        } elseif ( is_page() || is_single() ) {
-            $base = get_permalink();
 
         // Forum archive