Changeset 6136

Timestamp:

12/08/2016 03:34:29 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Moderation: Move sub_action query var into a passable argument, so all actions can have reliable sub-action usage.

See #3032.

File:

• trunk/src/includes/replies/functions.php (modified) (5 diffs)

trunk/src/includes/replies/functions.php

@@ -1639 +1639 @@
     }
 
+    // Subaction?
+    $sub_action = in_array( $_GET['sub_action'], array( 'trash', 'untrash', 'delete' ), true )
+        ? sanitize_key( $_GET['sub_action'] )
+        : false;
+
     // Do the reply toggling
     $retval = bbp_toggle_reply( array(
-        'id'     => $reply_id,
-        'action' => $action,
-        'data'   => $post_data
+        'id'         => $reply_id,
+        'action'     => $action,
+        'sub_action' => $sub_action,
+        'data'       => $post_data
     ) );
 
@@ -1676 +1682 @@
     // Parse the arguments
     $r = bbp_parse_args( $args, array(
-        'id'     => 0,
-        'action' => '',
-        'data'   => array()
+        'id'         => 0,
+        'action'     => '',
+        'sub_action' => '',
+        'data'       => array()
     ) );
 
@@ -1720 +1727 @@
         case 'bbp_toggle_reply_trash' :
 
-            // Subaction?
-            $sub_action = in_array( $_GET['sub_action'], array( 'trash', 'untrash', 'delete' ), true )
-                ? $_GET['sub_action']
-                : false;
-
             // Bail if no subaction
-            if ( empty( $sub_action ) ) {
+            if ( empty( $r['sub_action'] ) ) {
                 break;
             }
 
             // Which subaction?
-            switch ( $sub_action ) {
+            switch ( $r['sub_action'] ) {
                 case 'trash':
                     check_ajax_referer( "trash-{$nonce_suffix}" );
@@ -1767 +1769 @@
 
     // Filter & return
-    return apply_filters( 'bbp_do_toggle_reply_handler', $retval, $r, $args );
+    return apply_filters( 'bbp_toggle_reply', $retval, $r, $args );
 }
 
@@ -1791 +1793 @@
 
 /**
- * Return array of available reply handler actions
- *
- * @since 2.6.0 bbPress (rxxxx)
+ * Return array of available reply toggle actions
+ *
+ * @since 2.6.0 bbPress (r6133)
+ *
+ * @return array
  */
 function bbp_get_reply_toggles() {