Changeset 45972

Timestamp:

09/04/2019 04:57:35 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Improve URL validation in wp_validate_redirect().

Merges [45971] to the 5.2 branch.
Props vortfu, whyisjake, peterwilsoncc.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• src/wp-includes/pluggable.php (modified) (1 diff)

branches/5.2/src/wp-includes/pluggable.php

@@ -1395 +1395 @@
         if ( isset( $lp['scheme'] ) && ! ( 'http' == $lp['scheme'] || 'https' == $lp['scheme'] ) ) {
             return $default;
+        }
+
+        if ( ! isset( $lp['host'] ) && ! empty( $lp['path'] ) && '/' !== $lp['path'][0] ) {
+            $path = '';
+            if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
+                $path = dirname( parse_url( 'http://placeholder' . $_SERVER['REQUEST_URI'], PHP_URL_PATH ) . '?' );
+            }
+            $location = '/' . ltrim( $path . '/', '/' ) . $location;
         }