Changeset 6627 for trunk/src/includes/replies/template.php

Timestamp:

07/19/2017 04:11:11 PM (9 years ago)

Author:

johnjamesjacoby

Message:

General: Make sure object _get_ functions reach intended filters.

This retains existing behavior of bailing early and returning null if there is a post_type mismatch. Other similar functions would pass the null value through to the filter. These may do that eventually, but let's get these filters working first.

Fixes #3130.

File:

• trunk/src/includes/replies/template.php (modified) (2 diffs)

trunk/src/includes/replies/template.php

@@ -371 +371 @@
  */
 function bbp_get_reply( $reply, $output = OBJECT, $filter = 'raw' ) {
+
+    // Maybe get ID from empty or int
     if ( empty( $reply ) || is_numeric( $reply ) ) {
         $reply = bbp_get_reply_id( $reply );
     }
 
+    // Bail if no post object
     $reply = get_post( $reply, OBJECT, $filter );
     if ( empty( $reply ) ) {
@@ -380 +383 @@
     }
 
+    // Bail if not correct post type
     if ( $reply->post_type !== bbp_get_reply_post_type() ) {
         return null;
     }
 
-    if ( $output === OBJECT ) {
-        return $reply;
-
-    } elseif ( $output === ARRAY_A ) {
-        $_reply = get_object_vars( $reply );
-        return $_reply;
-
+    // Default return value is OBJECT
+    $retval = $reply;
+
+    // Array A
+    if ( $output === ARRAY_A ) {
+        $retval = get_object_vars( $reply );
+
+    // Array N
     } elseif ( $output === ARRAY_N ) {
-        $_reply = array_values( get_object_vars( $reply ) );
-        return $_reply;
+        $retval = array_values( get_object_vars( $reply ) );
     }
 
     // Filter & return
-    return apply_filters( 'bbp_get_reply', $reply, $output, $filter );
+    return apply_filters( 'bbp_get_reply', $retval, $reply, $output, $filter );
 }