Changeset 5907

Timestamp:

08/11/2015 08:08:36 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Common: bring bbp_verify_nonce_request() up to speed with improvments in BuddyPress.

See ​#buddypress6528. Props r-a-y.

Location:

trunk

Files:

• src/includes/common/functions.php (modified) (3 diffs)
• tests/phpunit/testcases/common/verify-nonce.php (added)

trunk/src/includes/common/functions.php

@@ -1785 +1785 @@
 
     // Maybe include the port, if it's included in home_url()
-    if ( isset( $parsed_home['port'] ) ) {
+    if ( isset( $parsed_home['port'] ) && false === strpos( $_SERVER['HTTP_HOST'], ':' ) ) {
         $request_host = $_SERVER['HTTP_HOST'] . ':' . $_SERVER['SERVER_PORT'];
     } else {
@@ -1797 +1797 @@
     /** Look for match ********************************************************/
 
-    // Filter the requested URL, for configurations like reverse proxying
+    /**
+     * Filters the requested URL being nonce-verified.
+     *
+     * Useful for configurations like reverse proxying.
+     *
+     * @since bbPress (2.5.0)
+     *
+     * @param string $requested_url The requested URL.
+     */
     $matched_url = apply_filters( 'bbp_verify_nonce_request_url', $requested_url );
 
     // Check the nonce
-    $result = isset( $_REQUEST[$query_arg] ) ? wp_verify_nonce( $_REQUEST[$query_arg], $action ) : false;
+    $result = isset( $_REQUEST[ $query_arg ] ) ? wp_verify_nonce( $_REQUEST[ $query_arg ], $action ) : false;
 
     // Nonce check failed
@@ -1808 +1816 @@
     }
 
-    // Do extra things
+    /**
+     * Fires at the end of the nonce verification check.
+     *
+     * @since bbPress (2.2.0)
+     *
+     * @param string $action Action nonce.
+     * @param bool   $result Boolean result of nonce verification.
+     */
     do_action( 'bbp_verify_nonce_request', $action, $result );