Changeset 3265 for branches/plugin/bbp-includes/bbp-topic-functions.php

Timestamp:

05/29/2011 01:51:02 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Improve the current title area of breadcrumbs.
Improve behavior of redirect field.
Allow single topic shortcodes to use pagination, and properly redirect on new replies.
Use wp_safe_redirect() in places where redirect_to fields are used.
Move theme compatibility setup function out of main bbPress class and into bbp-core-compatibility.php.
Move bbp_setup_theme_compat action off of after_setup_theme and into bbp_init.
Add supplemental functions to get and set if theme compatibility is currently helping load pieces of the current page.

File:

• branches/plugin/bbp-includes/bbp-topic-functions.php (modified) (4 diffs)

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -41 +41 @@
  * @uses bbp_unstick_topic() To unstick the topic
  * @uses bbp_get_topic_permalink() To get the topic permalink
- * @uses wp_redirect() To redirect to the topic link
+ * @uses wp_safe_redirect() To redirect to the topic link
  * @uses bbPress::errors::get_error_messages() To get the {@link WP_Error} error
  *                                              messages
@@ -240 +240 @@
                 /** Redirect **************************************************/
 
-                $topic_url = bbp_get_topic_permalink( $topic_id );
-
-                if ( $bbp->trash_status_id == $topic_data['post_status'] )
+                // Redirect to
+                $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+
+                // View all?
+                $count_hidden = (bool) ( !empty( $_GET['view'] ) && ( 'all' == $_GET['view'] ) || ( $topic_data['post_status'] == $bbp->trash_status_id ) );
+
+                // Get the topic URL
+                $topic_url = bbp_get_topic_permalink( $topic_id, $redirect_to );
+
+                // Add view all?
+                if ( !empty( $count_hidden ) )
                     $topic_url = add_query_arg( array( 'view' => 'all' ), $topic_url );
 
-                $topic_url = apply_filters( 'bbp_new_topic_redirect_to', $topic_url );
+                // Allow to be filtered
+                $topic_url = apply_filters( 'bbp_new_topic_redirect_to', $topic_url, $count_hidden, $redirect_to );
 
                 /** Successful Save *******************************************/
 
                 // Redirect back to new topic
-                wp_redirect( $topic_url );
+                wp_safe_redirect( $topic_url );
 
                 // For good measure
@@ -294 +303 @@
  *                                 to another
  * @uses bbp_get_topic_permalink() To get the topic permalink
- * @uses wp_redirect() To redirect to the topic link
+ * @uses wp_safe_redirect() To redirect to the topic link
  * @uses bbPress::errors::get_error_messages() To get the {@link WP_Error} error
  *                                              messages
@@ -504 +513 @@
                 do_action( 'bbp_edit_topic_post_extras', $topic_id );
 
+                /** Redirect **************************************************/
+
+                // Redirect to
+                $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+
+                // View all?
+                $count_hidden = (bool) ( !empty( $_GET['view'] ) && ( 'all' == $_GET['view'] ) );
+
+                // Get the topic URL
+                $topic_url = bbp_get_topic_permalink( $topic_id, $redirect_to );
+
+                // Add view all?
+                if ( !empty( $count_hidden ) )
+                    $topic_url = add_query_arg( array( 'view' => 'all' ), $topic_url );
+
+                // Allow to be filtered
+                $topic_url = apply_filters( 'bbp_edit_topic_redirect_to', $topic_url, $count_hidden, $redirect_to );
+
                 /** Successful Edit *******************************************/
 
                 // Redirect back to new topic
-                wp_redirect( bbp_get_topic_permalink( $topic_id ) );
+                wp_safe_redirect( $topic_url );
 
                 // For good measure