Changeset 7247

Timestamp:

03/08/2022 08:29:33 PM (3 years ago)

Author:

johnjamesjacoby

Message:

URLs: fix incorrect links for certain topic statuses.

This change prefers bbp_is_topic_public() over ! bbp_is_topic_pending() to determine whether or not certain reply & topic URLs should be "pretty".

Props dd32.

In branches/2.6, for 2.6.10.

Fixes #3424.

Location:

branches/2.6/src/includes

Files:

• replies/template.php (modified) (1 diff)
• topics/template.php (modified) (1 diff)

branches/2.6/src/includes/replies/template.php

@@ -466 +466 @@
         $has_slug   = ! empty( $topic ) ? $topic->post_name : '';
         $pretty     = bbp_use_pretty_urls();
-        $published  = ! bbp_is_topic_pending( $topic_id );
+        $published  = bbp_is_topic_public( $topic_id );
 
         // Don't include pagination if on first page

branches/2.6/src/includes/topics/template.php

@@ -809 +809 @@
 
         // If pretty permalinks are enabled, make our pagination pretty
-        $base = ! empty( $has_slug ) && bbp_use_pretty_urls() && ! bbp_is_topic_pending( $r['topic_id'] )
+        $base = ! empty( $has_slug ) && bbp_use_pretty_urls() && bbp_is_topic_public( $r['topic_id'] )
             ? trailingslashit( get_permalink( $r['topic_id'] ) ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' )
             : add_query_arg( 'paged', '%#%', get_permalink( $r['topic_id'] ) );