Ticket #2120: 2120.1.diff

includes/users/template-tags.php

@@ -700 +700 @@
                 // already the user's favorite
                 if ( bbp_is_favorites() ) {
                         $permalink = bbp_get_favorites_permalink( $user_id );
-                } elseif ( is_singular( bbp_get_topic_post_type() ) ) {
+                } elseif ( bbp_is_single_topic() || bbp_is_single_reply() ) {
                         $permalink = bbp_get_topic_permalink( $topic_id );
-                } elseif ( is_singular( bbp_get_reply_post_type() ) ) {
-                        $permalink = bbp_get_topic_permalink( $topic_id );
                 } else {
                         $permalink = get_permalink();
                 }
@@ -858 +856 @@
                 // subscribed already
                 if ( bbp_is_subscriptions() ) {
                         $permalink = bbp_get_subscriptions_permalink( $user_id );
-                } elseif ( is_singular( bbp_get_topic_post_type() ) ) {
+                } elseif ( bbp_is_single_topic() || bbp_is_single_reply() ) {
                         $permalink = bbp_get_topic_permalink( $topic_id );
-                } elseif ( is_singular( bbp_get_reply_post_type() ) ) {
-                        $permalink = bbp_get_topic_permalink( $topic_id );
                 } else {
                         $permalink = get_permalink();
                 }