Changeset 2586

Timestamp:

11/01/2010 06:07:32 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Fixes #1321. Also add checks to topic_id and forum_id functions.

Location:

branches/plugin

Files:

• bbp-admin.php (modified) (9 diffs)
• bbp-templatetags.php (modified) (3 diffs)

branches/plugin/bbp-admin.php

@@ -361 +361 @@
             return $column;
 
+        // Get topic forum ID
+        $forum_id = bbp_get_topic_forum_id();
+
+        // Populate column data
         switch ( $column ) {
+            // Forum
             case 'bbp_topic_forum' :
                 // Output forum name
@@ -368 +373 @@
                 // Link information
                 $actions = apply_filters( 'topic_forum_row_actions', array (
-                    'edit' => '<a href="' . add_query_arg( array( 'post' => bbp_get_topic_forum_ID(), 'action' => 'edit' ), admin_url( '/post.php' ) ) . '">' . __( 'Edit', 'bbpress' ) . '</a>',
-                    'view' => '<a href="' . bbp_get_topic_permalink() . '">' . __( 'View', 'bbpress' ) . '</a>'
+                    'edit' => '<a href="' . add_query_arg( array( 'post' => $forum_id, 'action' => 'edit' ), admin_url( '/post.php' ) ) . '">' . __( 'Edit', 'bbpress' ) . '</a>',
+                    'view' => '<a href="' . bbp_get_forum_permalink( $forum_id ) . '">' . __( 'View', 'bbpress' ) . '</a>'
                 ) );
 
@@ -383 +388 @@
                 break;
 
+            // Reply Count
             case 'bbp_topic_reply_count' :
                 // Output replies count
@@ -388 +394 @@
                 break;
 
+            // Freshness
             case 'bbp_topic_freshness' :
                 // Output last activity time and date
@@ -393 +400 @@
                 break;
 
+            // Do an action for anything else
             default :
                 do_action( 'bbp_admin_topics_column_data', $column, $post_id );
@@ -449 +457 @@
             return $column;
 
+        // Get topic ID
+        $topic_id = bbp_get_topic_forum_id();
+
+        // Populate Column Data
         switch ( $column ) {
+            // Topic
             case 'bbp_reply_topic' :
                 // Output forum name
@@ -456 +469 @@
                 // Link information
                 $actions = apply_filters( 'topic_forum_row_actions', array (
-                    'edit' => '<a href="' . add_query_arg( array( 'post' => bbp_get_topic_forum_ID(), 'action' => 'edit' ), admin_url( '/post.php' ) ) . '">' . __( 'Edit', 'bbpress' ) . '</a>',
-                    'view' => '<a href="' . bbp_get_topic_permalink() . '">' . __( 'View', 'bbpress' ) . '</a>'
+                    'edit' => '<a href="' . add_query_arg( array( 'post' => $topic_id, 'action' => 'edit' ), admin_url( '/post.php' ) ) . '">' . __( 'Edit', 'bbpress' ) . '</a>',
+                    'view' => '<a href="' . bbp_get_topic_permalink( $topic_id ) . '">' . __( 'View', 'bbpress' ) . '</a>'
                 ) );
 
@@ -471 +484 @@
                 break;
 
+            // Forum
             case 'bbp_reply_forum' :
                 // Output replies count
                 break;
 
+            // Freshness
             case 'bbp_topic_freshness':
                 // Output last activity time and date
@@ -480 +495 @@
                 break;
 
+            // Do action for anything else
             default :
                 do_action( 'bbp_admin_replies_column_data', $column, $post_id );

branches/plugin/bbp-templatetags.php

@@ -141 +141 @@
             $bbp_forum_id = $wp_query->post->ID;
 
+        // Currently viewing a topic
+        elseif ( bbp_is_topic() )
+            $bbp_forum_id = bbp_get_topic_forum_id();
+
         // Fallback
         // @todo - experiment
@@ -179 +183 @@
      */
     function bbp_get_forum_permalink ( $forum_id = 0 ) {
+        if ( empty( $forum_id ) )
+            $forum_id = bbp_get_forum_id();
+
         return apply_filters( 'bbp_get_forum_permalink', get_permalink( $forum_id ) );
     }
@@ -533 +540 @@
         elseif ( bbp_is_topic() && isset( $wp_query->post->ID ) )
             $bbp_topic_id = $wp_query->post->ID;
+
+        // Currently viewing a singular reply
+        elseif ( bbp_is_reply() )
+            $bbp_topic_id = bbp_get_reply_topic_id();
 
         // Fallback