Changeset 5165

Timestamp:

11/23/2013 10:09:47 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Revert part of r5164 that moved the $r array within a bbp_is_forum_category() check in bbp_get_forum_subscription_link(), as it caused debug notices from $r not being defined. See #2475.

File:

• trunk/includes/forums/template.php (modified) (1 diff)

trunk/includes/forums/template.php

@@ -819 +819 @@
         $retval = false;
 
+        // Parse the arguments
+        $r = bbp_parse_args( $args, array(
+            'forum_id'    => 0,
+            'user_id'     => 0,
+            'before'      => '',
+            'after'       => '',
+            'subscribe'   => __( 'Subscribe',   'bbpress' ),
+            'unsubscribe' => __( 'Unsubscribe', 'bbpress' )
+        ), 'get_forum_subscribe_link' );
+
         // No link for categories until we support subscription hierarchy
         // @see http://bbpress.trac.wordpress.org/ticket/2475
         if ( ! bbp_is_forum_category() ) {
-
-            // Parse the arguments
-            $r = bbp_parse_args( $args, array(
-                'forum_id'    => 0,
-                'user_id'     => 0,
-                'before'      => '',
-                'after'       => '',
-                'subscribe'   => __( 'Subscribe',   'bbpress' ),
-                'unsubscribe' => __( 'Unsubscribe', 'bbpress' )
-            ), 'get_forum_subscribe_link' );
-
-            // Get the link
             $retval = bbp_get_user_subscribe_link( $r );
         }