Ticket #19918: 19918-circular-fragment.diff

wp-includes/canonical.php

@@ -494 +494 @@
         $redirect_url = apply_filters( 'redirect_canonical', $redirect_url, $requested_url );
 
         // 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;
         }
 
@@ -540 +540 @@
 }
 
 /**
+ * Strips the #fragment from a URL, if one is present.
+ *
+ * @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'];
+                $redirect_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
  *
  * @since 2.3.0