Changeset 40661 for trunk/src/wp-includes/canonical.php

Timestamp:

05/12/2017 10:49:48 PM (8 years ago)

Author:

azaozz

Message:

Revert [40256] for now as some tests are failing in some environments.

See #20383.

File:

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

trunk/src/wp-includes/canonical.php

@@ -392 +392 @@
     $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
 
-    $punctuation_pattern = implode( '|', array_map( 'preg_quote', array(
-        ' ', '%20',       // space
-        '!', '%21',       // exclamation mark
-        '"', '%22',       // double quote
-        "'", '%27',       // single quote
-        '(', '%28',       // opening bracket
-        ')', '%29',       // closing bracket
-        ',', '%2C',       // comma
-        '.', '%2E',       // period
-        ';', '%3B',       // semicolon
-        '{', '%7B',       // opening curly bracket
-        '}', '%7D',       // closing curly bracket
-        '“', '%E2%80%9C', // opening curly quote
-        '”', '%E2%80%9D', // closing curly quote
-    ) ) );
-
-    // Remove trailing spaces and end punctuation from the path.
-    $redirect['path'] = preg_replace( "#($punctuation_pattern)+$#", '', $redirect['path'] );
+    // Remove trailing spaces from the path
+    $redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
 
     if ( !empty( $redirect['query'] ) ) {
-        // Remove trailing spaces and end punctuation from certain terminating query string args.
-        $redirect['query'] = preg_replace( "#((p|page_id|cat|tag)=[^&]*?)($punctuation_pattern)+$#", '$1', $redirect['query'] );
+        // Remove trailing spaces from certain terminating query string args
+        $redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
 
         // Clean up empty query strings