Changeset 55540 for trunk/src/wp-includes/functions.php

Timestamp:

03/13/2023 10:52:26 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Bring some consistency to wp_validate_redirect() existence checks.

The wp_get_referer() and wp_get_original_referer() functions both depend on wp_validate_redirect() and check whether it is defined by the time they run, but do so in a slightly different way.

This commit ensures both functions return early if they are called before wp_validate_redirect() is defined.

Follow-up to [3908], [25399], [25400].

See #57839.

File:

• trunk/src/wp-includes/functions.php (modified) (3 diffs)

trunk/src/wp-includes/functions.php

@@ -1954 +1954 @@
  */
 function wp_get_referer() {
+    // Return early if called before wp_validate_redirect() is defined.
     if ( ! function_exists( 'wp_validate_redirect' ) ) {
         return false;
@@ -1960 +1961 @@
     $ref = wp_get_raw_referer();
 
-    if ( $ref && wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref && home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref ) {
+    if ( $ref && wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref
+        && home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref
+    ) {
         return wp_validate_redirect( $ref, false );
     }
@@ -1994 +1997 @@
  */
 function wp_get_original_referer() {
-    if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) ) {
+    // Return early if called before wp_validate_redirect() is defined.
+    if ( ! function_exists( 'wp_validate_redirect' ) ) {
+        return false;
+    }
+
+    if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) ) {
         return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
     }