Changeset 35770

Timestamp:

12/04/2015 11:10:09 PM (11 years ago)

Author:

wonderboymusic

Message:

Canonical: introduce strip_fragment_from_url() and use when comparing URLs in redirect_canonical().

Props tellyworth.
Fixes #19918.

File:

• trunk/src/wp-includes/canonical.php (modified) (2 diffs)

trunk/src/wp-includes/canonical.php

@@ -490 +490 @@
 
         // yes, again -- in case the filter aborted the request
-        if ( ! $redirect_url || $redirect_url == $requested_url ) {
+        if ( ! $redirect_url || strip_fragment_from_url( $redirect_url ) == strip_fragment_from_url( $requested_url ) ) {
                 return;
         }
@@ -536 +536 @@
 
 /**
+ * Strips the #fragment from a URL, if one is present.
+ *
+ * @since 4.4.0
+ *
+ * @param string $url The URL to strip.
+ * @return string The altered URL.
+ */
+function strip_fragment_from_url( $url ) {
+        $parsed_url = @parse_url( $url );
+        if ( ! empty( $parsed_url['host'] ) ) {
+                // This mirrors code in redirect_canonical(). It does not handle every case.
+                $url = $parsed_url['scheme'] . '://' . $parsed_url['host'];
+                if ( ! empty( $parsed_url['port'] ) ) {
+                        $url .= ':' . $parsed_url['port'];
+                }
+                $url .= $parsed_url['path'];
+                if ( ! empty( $parsed_url['query'] ) ) {
+                        $url .= '?' . $parsed_url['query'];
+                }
+        }
+
+        return $url;
+}
+
+/**
  * Attempts to guess the correct URL based on query vars
  *