Changeset 3125 for branches/plugin/bbp-admin/bbp-replies.php

Timestamp:

05/09/2011 06:51:40 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Prevent forum and topic ID's from being poisoned by functions that attempt to make calculations out of turn. Also prevent incorrect assignment of parent topic and forum ID's when posting from admin area. Fixes #1433.

File:

• branches/plugin/bbp-admin/bbp-replies.php (modified) (2 diffs)

branches/plugin/bbp-admin/bbp-replies.php

@@ -568 +568 @@
 
                 // Output forum name
-                bbp_topic_title( $topic_id );
-
-                // Link information
-                $actions = apply_filters( 'reply_topic_row_actions', array (
-                    '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>'
-                ) );
-
-                // Output forum post row links
-                foreach ( $actions as $action => $link )
-                    $formatted_actions[] = '<span class="' . $action . '">' . $link . '</span>';
-
-                //echo '<div class="row-actions">' . implode( ' | ', $formatted_actions ) . '</div>';
+                if ( !empty( $topic_id ) ) {
+                    bbp_topic_title( $topic_id );
+
+                    // Link information
+                    $actions = apply_filters( 'reply_topic_row_actions', array (
+                        '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>'
+                    ) );
+
+                    // Output forum post row links
+                    foreach ( $actions as $action => $link )
+                        $formatted_actions[] = '<span class="' . $action . '">' . $link . '</span>';
+
+                    if ( !empty( $topic_id ) )
+                        echo '<div class="row-actions">' . implode( ' | ', $formatted_actions ) . '</div>';
+
+                // Reply has no topic
+                } else {
+                    _e( '(No Topic)', 'bbpress' );
+                }
 
                 break;
@@ -591 +598 @@
 
                 // Output forum name
-                bbp_forum_title( $forum_id );
-
-                // Link information
-                $actions = apply_filters( 'reply_topic_forum_row_actions', array (
-                    '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>'
-                ) );
-
-                // Output forum post row links
-                foreach ( $actions as $action => $link )
-                    $formatted_actions[] = '<span class="' . $action . '">' . $link . '</span>';
-
-                //echo '<div class="row-actions">' . implode( ' | ', $formatted_actions ) . '</div>';
+                if ( !empty( $forum_id ) ) {
+                    bbp_forum_title( $forum_id );
+
+                    // Link information
+                    $actions = apply_filters( 'reply_topic_forum_row_actions', array (
+                        '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>'
+                    ) );
+
+                    // Output forum post row links
+                    foreach ( $actions as $action => $link )
+                        $formatted_actions[] = '<span class="' . $action . '">' . $link . '</span>';
+
+                    // Show forum actions
+                    if ( !empty( $forum_id ) )
+                        echo '<div class="row-actions">' . implode( ' | ', $formatted_actions ) . '</div>';
+
+                // Reply has no forum
+                } else {
+                    _e( '(No Forum)', 'bbpress' );
+                }
 
                 break;