Changeset 5658 for trunk/src/includes/replies/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/replies/functions.php (modified) (10 diffs)

trunk/src/includes/replies/functions.php

@@ -102 +102 @@
  *                    the reply to id
  * @uses bbp_get_reply_url() To get the paginated url to the reply
- * @uses wp_safe_redirect() To redirect to the reply url
+ * @uses bbp_redirect() To redirect to the reply url
  * @uses bbPress::errors::get_error_message() To get the {@link WP_Error} error
  *                                              message
@@ -450 +450 @@
 
         // Redirect back to new reply
-        wp_safe_redirect( $reply_url );
-
-        // For good measure
-        exit();
+        bbp_redirect( $reply_url );
 
     /** Errors ****************************************************************/
@@ -492 +489 @@
  *                    and the reply to id
  * @uses bbp_get_reply_url() To get the paginated url to the reply
- * @uses wp_safe_redirect() To redirect to the reply url
+ * @uses bbp_redirect() To redirect to the reply url
  * @uses bbPress::errors::get_error_message() To get the {@link WP_Error} error
  *                                             message
@@ -762 +759 @@
 
         // Redirect back to new reply
-        wp_safe_redirect( $reply_url );
-
-        // For good measure
-        exit();
+        bbp_redirect( $reply_url );
 
     /** Errors ****************************************************************/
@@ -1274 +1268 @@
  *                    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_move_reply_handler( $action = '' ) {
@@ -1497 +1491 @@
 
     // 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 ) );
 }
 
@@ -1570 +1561 @@
  * @uses bbp_get_reply_url() To get the reply url
  * @uses add_query_arg() To add custom args to the reply url
- * @uses wp_safe_redirect() To redirect to the reply
+ * @uses bbp_redirect() To redirect to the reply
  * @uses bbPress::errors:add() To log the error messages
  */
@@ -1694 +1685 @@
 
         // Redirect back to reply
-        wp_safe_redirect( $reply_url );
-
-        // For good measure
-        exit();
+        bbp_redirect( $reply_url );
 
     // Handle errors
@@ -2311 +2299 @@
  * @uses current_user_can()
  * @uses bbp_get_topic_id()
- * @uses wp_safe_redirect()
+ * @uses bbp_redirect()
  * @uses bbp_get_topic_permalink()
  */
@@ -2317 +2305 @@
 
     // Bail if not editing a topic
-    if ( !bbp_is_reply_edit() ) {
+    if ( ! bbp_is_reply_edit() ) {
         return;
     }
 
     // User cannot edit topic, so redirect back to reply
-    if ( !current_user_can( 'edit_reply', bbp_get_reply_id() ) ) {
-        wp_safe_redirect( bbp_get_reply_url() );
-        exit();
+    if ( ! current_user_can( 'edit_reply', bbp_get_reply_id() ) ) {
+        bbp_redirect( bbp_get_reply_url() );
     }
 }