Changeset 17030

Timestamp:

12/17/10 20:23:34 (4 years ago)

Author:

markjaquith

Message:

Do not add URL query args twice in certain Canonical Redirect situations. Use add_query_arg(). props filosofo. fixes #15774

File:

• trunk/wp-includes/canonical.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -235 +235 @@
     $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
     if ( $redirect_url && !empty($redirect['query']) ) {
-        if ( strpos($redirect_url, '?') !== false )
-            $redirect_url .= '&';
-        else
-            $redirect_url .= '?';
-        $redirect_url .= $redirect['query'];
+        parse_str( $redirect['query'], $_parsed_query );
+        $redirect_url = add_query_arg( $_parsed_query, $redirect_url );
     }