Changeset 4775

Timestamp:

02/19/2013 06:07:10 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Pass $r instead of $args in ending filters. Ensures correct array of arguments is available to filters. These were skipped as part of #2056. Props alex-ye. Fixes #2218.

Location:

trunk/includes

Files:

• common/functions.php (modified) (2 diffs)
• common/template-tags.php (modified) (2 diffs)
• forums/template-tags.php (modified) (2 diffs)
• replies/template-tags.php (modified) (1 diff)
• topics/template-tags.php (modified) (1 diff)
• users/template-tags.php (modified) (1 diff)

trunk/includes/common/functions.php

@@ -579 +579 @@
     $statistics['hidden_reply_title'] = isset( $hidden_reply_title ) ? $hidden_reply_title : '';
 
-    return apply_filters( 'bbp_get_statistics', $statistics, $args );
+    return apply_filters( 'bbp_get_statistics', $statistics, $r );
 }
 
@@ -633 +633 @@
 
     // Finally, return sanitized data or false
-    return apply_filters( 'bbp_filter_anonymous_post_data', $retval, $args );
+    return apply_filters( 'bbp_filter_anonymous_post_data', $retval, $r );
 }
 

trunk/includes/common/template-tags.php

@@ -1112 +1112 @@
     $login_url = site_url( $login_url, $r['context'] );
 
-    echo apply_filters( 'bbp_wp_login_action', $login_url, $args );
+    echo apply_filters( 'bbp_wp_login_action', $login_url, $r );
 }
 
@@ -1430 +1430 @@
         }
 
-        return apply_filters( 'bbp_get_dropdown', $retval, $args );
+        return apply_filters( 'bbp_get_dropdown', $retval, $r );
     }
 

trunk/includes/forums/template-tags.php

@@ -660 +660 @@
     $sub_forums = !empty( $r['post_parent'] ) ? $get_posts->query( $r ) : array();
 
-    return (array) apply_filters( 'bbp_forum_get_subforums', $sub_forums, $args );
+    return (array) apply_filters( 'bbp_forum_get_subforums', $sub_forums, $r );
 }
 
@@ -1922 +1922 @@
 
         // Return filtered result
-        return apply_filters( 'bbp_get_single_forum_description', $retstr, $args );
+        return apply_filters( 'bbp_get_single_forum_description', $retstr, $r );
     }
 

trunk/includes/replies/template-tags.php

@@ -1251 +1251 @@
         $author_role = sprintf( '%1$s<div class="%2$s">%3$s</div>%4$s', $r['before'], $r['class'], $role, $r['after'] );
 
-        return apply_filters( 'bbp_get_reply_author_role', $author_role, $args );
+        return apply_filters( 'bbp_get_reply_author_role', $author_role, $r );
     }
 

trunk/includes/topics/template-tags.php

@@ -2264 +2264 @@
         $links = implode( $r['sep'], array_filter( $r['links'] ) );
 
-        return apply_filters( 'bbp_get_topic_admin_links', $r['before'] . $links . $r['after'], $args );
+        return apply_filters( 'bbp_get_topic_admin_links', $r['before'] . $links . $r['after'], $r );
     }
 

trunk/includes/users/template-tags.php

@@ -292 +292 @@
 
         // Filter and return
-        return (string) apply_filters( 'bbp_get_user_nicename', $retval, $user_id, $args );
+        return (string) apply_filters( 'bbp_get_user_nicename', $retval, $user_id, $r );
     }