Ticket #2581: ticket2581.patch

template.php

@@ -1839 +1839 @@
                 // No link
                 $retval = false;
 
-                // Parse the arguments
-                $r = bbp_parse_args( $args, array(
-                        'user_id'     => 0,
-                        'topic_id'    => 0,
-                        'before'      => ' | ',
-                        'after'       => '',
-                        'subscribe'   => __( 'Subscribe',   'bbpress' ),
-                        'unsubscribe' => __( 'Unsubscribe', 'bbpress' )
-                ), 'get_forum_subscribe_link' );
-
                 // Get the link
-                $retval = bbp_get_user_subscribe_link( $r );
+                $retval = bbp_get_user_subscribe_link();
 
-                return apply_filters( 'bbp_get_topic_subscribe_link', $retval, $r );
+                return apply_filters( 'bbp_get_topic_subscribe_link', $retval );
         }
 
 /** Topic Favorites ***********************************************************/
@@ -1892 +1882 @@
                         'after'     => '',
                         'favorite'  => __( 'Favorite',   'bbpress' ),
                         'favorited' => __( 'Unfavorite', 'bbpress' )
-                ), 'get_forum_favorite_link' );
+                ), 'get_topic_favorite_link' );
 
                 // Get the link
                 $retval = bbp_get_user_favorites_link( $r );