Ticket #7537: 7537.diff

wp-includes/canonical.php

@@ -157 +157 @@
         $redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
 
         // Remove trailing slashes from certain terminating query string args
-        $redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
+        $redirect['query'] = isset($redirect['query']) ? preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] ) : '';
 
         // Clean up empty query strings
         $redirect['query'] = preg_replace( '#&?(p|page_id|cat|tag)=?$#', '', $redirect['query'] );
@@ -206 +206 @@
         if ( isset( $redirect['port'] ) )
                 $compare_redirect[] = $redirect['port'];
 
-        if ( isset( $redirect['query'] ) )
+        if ( ! empty( $redirect['query'] ) )
                 $compare_redirect[] = $redirect['query'];
 
         if ( $compare_original !== $compare_redirect ) {
@@ -214 +214 @@
                 if ( isset($redirect['port']) )
                         $redirect_url .= ':' . $redirect['port'];
                 $redirect_url .= $redirect['path'];
-                if ( $redirect['query'] )
+                if ( ! empty($redirect['query']) )
                         $redirect_url .= '?' . $redirect['query'];
         }