Changeset 5658 for trunk/src/includes/topics/functions.php

Timestamp:

03/24/2015 01:32:20 PM (11 years ago)

Author:

johnjamesjacoby

Message:

API: Introduce bbp_redirect()

• Wraps wp_safe_redirect() & exit() calls
• Prevents errors from potentially empty wp_get_referrer() results
• Replace wp_safe_redirect() usages with bbp_redirect()

Fixes #2778.

File:

• trunk/src/includes/topics/functions.php (modified) (16 diffs)

trunk/src/includes/topics/functions.php

@@ -109 +109 @@
  * @uses bbp_unstick_topic() To unstick the topic
  * @uses bbp_get_topic_permalink() To get the topic permalink
- * @uses wp_safe_redirect() To redirect to the topic link
+ * @uses bbp_redirect() To redirect to the topic link
  * @uses bbPress::errors::get_error_messages() To get the {@link WP_Error} error
  *                                              messages
@@ -428 +428 @@
 
         // Redirect back to new topic
-        wp_safe_redirect( $redirect_url );
-
-        // For good measure
-        exit();
+        bbp_redirect( $redirect_url );
 
     // Errors
@@ -471 +468 @@
  *                                 to another
  * @uses bbp_get_topic_permalink() To get the topic permalink
- * @uses wp_safe_redirect() To redirect to the topic link
+ * @uses bbp_redirect() To redirect to the topic link
  * @uses bbPress::errors::get_error_messages() To get the {@link WP_Error} error
  *                                              messages
@@ -792 +789 @@
 
         // Redirect back to new topic
-        wp_safe_redirect( $topic_url );
-
-        // For good measure
-        exit();
+        bbp_redirect( $topic_url );
 
     /** Errors ****************************************************************/
@@ -1149 +1143 @@
  *                    topic ids and source topic's forum id
  * @uses bbp_get_topic_permalink() To get the topic permalink
- * @uses wp_safe_redirect() To redirect to the topic link
+ * @uses bbp_redirect() To redirect to the topic link
  */
 function bbp_merge_topic_handler( $action = '' ) {
@@ -1362 +1356 @@
 
     // Redirect back to new topic
-    wp_safe_redirect( bbp_get_topic_permalink( $destination_topic->ID ) );
-
-    // For good measure
-    exit();
+    bbp_redirect( bbp_get_topic_permalink( $destination_topic->ID ) );
 }
 
@@ -1449 +1440 @@
  *                    source topic ids and source topic's forum id
  * @uses bbp_get_topic_permalink() To get the topic permalink
- * @uses wp_safe_redirect() To redirect to the topic link
+ * @uses bbp_redirect() To redirect to the topic link
  */
 function bbp_split_topic_handler( $action = '' ) {
@@ -1745 +1736 @@
 
     // Redirect back to the topic
-    wp_safe_redirect( bbp_get_topic_permalink( $destination_topic->ID ) );
-
-    // For good measure
-    exit();
+    bbp_redirect( bbp_get_topic_permalink( $destination_topic->ID ) );
 }
 
@@ -1811 +1799 @@
  * @uses do_action() Calls actions based on the actions with associated args
  * @uses is_wp_error() To check if the value retrieved is a {@link WP_Error}
- * @uses wp_safe_redirect() To redirect to the url
+ * @uses bbp_redirect() To redirect to the url
  */
 function bbp_edit_topic_tag_handler( $action = '' ) {
@@ -1980 +1968 @@
     // Redirect back
     $redirect = ( ! empty( $redirect ) && ! is_wp_error( $redirect ) ) ? $redirect : home_url();
-    wp_safe_redirect( $redirect );
-
-    // For good measure
-    exit();
+    bbp_redirect( $redirect );
 }
 
@@ -2087 +2072 @@
  * @uses bbp_get_topic_permalink() To get the topic link
  * @uses add_query_arg() To add args to the url
- * @uses wp_safe_redirect() To redirect to the topic
+ * @uses bbp_redirect() To redirect to the topic
  * @uses bbPress::errors:add() To log the error messages
  */
@@ -2232 +2217 @@
         }
 
-        wp_safe_redirect( $redirect );
-
-        // For good measure
-        exit();
+        bbp_redirect( $redirect );
 
     // Handle errors
@@ -3786 +3768 @@
  * @uses current_user_can()
  * @uses bbp_get_topic_id()
- * @uses wp_safe_redirect()
+ * @uses bbp_redirect()
  * @uses bbp_get_topic_permalink()
  */
@@ -3798 +3780 @@
     // User cannot edit topic, so redirect back to topic
     if ( ! current_user_can( 'edit_topic', bbp_get_topic_id() ) ) {
-        wp_safe_redirect( bbp_get_topic_permalink() );
-        exit();
+        bbp_redirect( bbp_get_topic_permalink() );
     }
 }
@@ -3811 +3792 @@
  * @uses current_user_can()
  * @uses bbp_get_topic_tag_id()
- * @uses wp_safe_redirect()
+ * @uses bbp_redirect()
  * @uses bbp_get_topic_tag_link()
  */
@@ -3823 +3804 @@
     // Bail if current user cannot edit topic tags
     if ( ! current_user_can( 'edit_topic_tags', bbp_get_topic_tag_id() ) ) {
-        wp_safe_redirect( bbp_get_topic_tag_link() );
-        exit();
-    }
-}
+        bbp_redirect( bbp_get_topic_tag_link() );
+    }
+}