Changeset 4970

Timestamp:

02/21/2017 01:50:51 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Use bbp_topic_admin_links and bbp_reply_admin_links filters to remove the Trash link.

Their get_* equivalents operate on the resulting markup, instead of just the links array, and require more code for the same thing.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -10 +10 @@
 
         // Display-related filters and actions.
-        add_filter( 'bbp_get_topic_admin_links', array( $this, 'get_admin_links' ), 10, 3 );
-        add_filter( 'bbp_get_reply_admin_links', array( $this, 'get_admin_links' ), 10, 3 );
+        add_filter( 'bbp_topic_admin_links', array( $this, 'admin_links' ), 10, 3 );
+        add_filter( 'bbp_reply_admin_links', array( $this, 'admin_links' ), 10, 3 );
 
         // Gravatar suppression on lists of topics.
@@ -46 +46 @@
      * permanently delete it when the trash is emptied. Better to mark it as
      * pending or spam.
-     */
-    public function get_admin_links( $retval, $r, $args ) {
-        unset( $r['links']['trash'] );
-
-        $links = implode( $r['sep'], array_filter( $r['links'] ) );
-        $retval = $r['before'] . $links . $r['after'];
-
-        return $retval;
+     *
+     * @param array $r       Admin links array.
+     * @param int   $post_id Topic or reply ID.
+     * @return array Filtered admin links array.
+     */
+    public function admin_links( $r, $post_id ) {
+        unset( $r['trash'] );
+
+        return $r;
     }