Changeset 5674 for trunk/src/includes/topics/template.php

Timestamp:

04/15/2015 02:10:20 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Topics: Normalize admin links:

• Remove superfluous (int) type cast
• Pass $args into filters
• Use bbp_get_edit_rewrite_id() where applicable

File:

• trunk/src/includes/topics/template.php (modified) (19 diffs)

trunk/src/includes/topics/template.php

@@ -2565 +2565 @@
         ), 'get_topic_edit_link' );
 
-        $topic = bbp_get_topic( bbp_get_topic_id( (int) $r['id'] ) );
+        // Get the topic
+        $topic = bbp_get_topic( bbp_get_topic_id( $r['id'] ) );
 
         // Bypass check if user has caps
@@ -2577 +2578 @@
 
         // Get uri
-        $uri = bbp_get_topic_edit_url( $r['id'] );
+        $uri = bbp_get_topic_edit_url( $topic->ID );
 
         // Bail if no uri
@@ -2586 +2587 @@
         $retval = $r['link_before'] . '<a href="' . esc_url( $uri ) . '" class="bbp-topic-edit-link">' . $r['edit_text'] . '</a>' . $r['link_after'];
 
-        return apply_filters( 'bbp_get_topic_edit_link', $retval, $r );
+        return apply_filters( 'bbp_get_topic_edit_link', $retval, $r, $args );
     }
 
@@ -2616 +2617 @@
         global $wp_rewrite;
 
-        $bbp = bbpress();
-
         $topic = bbp_get_topic( bbp_get_topic_id( $topic_id ) );
         if ( empty( $topic ) ) {
@@ -2628 +2627 @@
         // Pretty permalinks
         if ( $wp_rewrite->using_permalinks() ) {
-            $url = trailingslashit( $topic_link ) . $bbp->edit_id;
+            $url = trailingslashit( $topic_link ) . bbp_get_edit_rewrite_id();
             $url = trailingslashit( $url );
 
         // Unpretty permalinks
         } else {
-            $url = add_query_arg( array( bbp_get_topic_post_type() => $topic->post_name, $bbp->edit_id => '1' ), $topic_link );
+            $url = add_query_arg( array( bbp_get_topic_post_type() => $topic->post_name, bbp_get_edit_rewrite_id() => '1' ), $topic_link );
         }
 
@@ -2693 +2692 @@
         ), 'get_topic_trash_link' );
 
-        $actions = array();
-        $topic   = bbp_get_topic( bbp_get_topic_id( (int) $r['id'] ) );
+        $topic = bbp_get_topic( bbp_get_topic_id( $r['id'] ) );
 
         if ( empty( $topic ) || ! current_user_can( 'delete_topic', $topic->ID ) ) {
             return;
         }
+
+        $actions = array();
 
         if ( bbp_is_topic_trash( $topic->ID ) ) {
@@ -2713 +2713 @@
         $retval = $r['link_before'] . implode( $r['sep'], $actions ) . $r['link_after'];
 
-        return apply_filters( 'bbp_get_topic_trash_link', $retval, $r );
+        return apply_filters( 'bbp_get_topic_trash_link', $retval, $r, $args );
     }
 
@@ -2762 +2762 @@
         ), 'get_topic_close_link' );
 
-        $topic = bbp_get_topic( bbp_get_topic_id( (int) $r['id'] ) );
+        $topic = bbp_get_topic( bbp_get_topic_id( $r['id'] ) );
 
         if ( empty( $topic ) || ! current_user_can( 'moderate', $topic->ID ) ) {
@@ -2773 +2773 @@
         $retval  = $r['link_before'] . '<a href="' . esc_url( $uri ) . '" class="bbp-topic-close-link">' . $display . '</a>' . $r['link_after'];
 
-        return apply_filters( 'bbp_get_topic_close_link', $retval, $r );
+        return apply_filters( 'bbp_get_topic_close_link', $retval, $r, $args );
     }
 
@@ -2823 +2823 @@
         ), 'get_topic_approve_link' );
 
-        $topic = bbp_get_topic( bbp_get_topic_id( (int) $r['id'] ) );
-
-        if ( empty( $topic ) || !current_user_can( 'moderate', $topic->ID ) ) {
+        $topic = bbp_get_topic( bbp_get_topic_id( $r['id'] ) );
+
+        if ( empty( $topic ) || ! current_user_can( 'moderate', $topic->ID ) ) {
             return;
         }
@@ -2834 +2834 @@
         $retval  = $r['link_before'] . '<a href="' . esc_url( $uri ) . '" class="bbp-topic-approve-link">' . $display . '</a>' . $r['link_after'];
 
-        return apply_filters( 'bbp_get_topic_approve_link', $retval, $r );
+        return apply_filters( 'bbp_get_topic_approve_link', $retval, $r, $args );
     }
 
@@ -2885 +2885 @@
         ), 'get_topic_stick_link' );
 
-        $topic = bbp_get_topic( bbp_get_topic_id( (int) $r['id'] ) );
+        $topic = bbp_get_topic( bbp_get_topic_id( $r['id'] ) );
 
         if ( empty( $topic ) || ! current_user_can( 'moderate', $topic->ID ) ) {
@@ -2911 +2911 @@
         $retval = $r['link_before'] . $stick_display . $super_display . $r['link_after'];
 
-        return apply_filters( 'bbp_get_topic_stick_link', $retval, $r );
+        return apply_filters( 'bbp_get_topic_stick_link', $retval, $r, $args );
     }
 
@@ -2955 +2955 @@
         ), 'get_topic_merge_link' );
 
-        $topic = bbp_get_topic( bbp_get_topic_id( (int) $r['id'] ) );
+        $topic = bbp_get_topic( bbp_get_topic_id( $r['id'] ) );
 
         if ( empty( $topic ) || ! current_user_can( 'moderate', $topic->ID ) ) {
@@ -2964 +2964 @@
         $retval = $r['link_before'] . '<a href="' . esc_url( $uri ) . '" class="bbp-topic-merge-link">' . $r['merge_text'] . '</a>' . $r['link_after'];
 
-        return apply_filters( 'bbp_get_topic_merge_link', $retval, $args );
+        return apply_filters( 'bbp_get_topic_merge_link', $retval, $r, $args );
     }
 
@@ -3013 +3013 @@
         ), 'get_topic_spam_link' );
 
-        $topic = bbp_get_topic( bbp_get_topic_id( (int) $r['id'] ) );
+        $topic = bbp_get_topic( bbp_get_topic_id( $r['id'] ) );
 
         if ( empty( $topic ) || ! current_user_can( 'moderate', $topic->ID ) ) {
@@ -3024 +3024 @@
         $retval  = $r['link_before'] . '<a href="' . esc_url( $uri ) . '" class="bbp-topic-spam-link">' . $display . '</a>' . $r['link_after'];
 
-        return apply_filters( 'bbp_get_topic_spam_link', $retval, $r );
+        return apply_filters( 'bbp_get_topic_spam_link', $retval, $r, $args );
     }
 
@@ -3063 +3063 @@
 
         // Get the reply to use it's ID and post_parent
-        $topic = bbp_get_topic( bbp_get_topic_id( (int) $r['id'] ) );
+        $topic = bbp_get_topic( bbp_get_topic_id( $r['id'] ) );
 
         // Bail if no reply or user cannot reply
@@ -3753 +3753 @@
         if ( ! empty( $term->term_id ) ) {
 
-            $bbp = bbpress();
-
             // Pretty
             if ( $wp_rewrite->using_permalinks() ) {
-                $retval = user_trailingslashit( trailingslashit( bbp_get_topic_tag_link() ) . $bbp->edit_id );
+                $retval = user_trailingslashit( trailingslashit( bbp_get_topic_tag_link() ) . bbp_get_edit_rewrite_id() );
 
             // Ugly
             } else {
-                $retval = add_query_arg( array( $bbp->edit_id => '1' ), bbp_get_topic_tag_link() );
+                $retval = add_query_arg( array( bbp_get_edit_rewrite_id() => '1' ), bbp_get_topic_tag_link() );
             }