Changeset 10689

Timestamp:

02/17/2021 06:31:51 AM (5 years ago)

Author:

dd32

Message:

Translate: Allow for the trailing slash to be altered on plaintext urls.

This avoids triggering an error when http://wordpress.org is translated to https://wordpress.org/.

This will still trigger a warning on a trailing slash changing inside a HTML tag like <a href="..">.

See #5155.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-warnings/wporg-gp-custom-warnings.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-warnings/wporg-gp-custom-warnings.php

@@ -52 +52 @@
         }
 
-        // Check to see if only the scheme was changed (https <=> http), discard if so.
+        // Check to see if only the scheme (https <=> http) or a trailing slash was changed, discard if so.
         foreach ( $missing_urls as $key => $missing_url ) {
-            $scheme = parse_url( $missing_url, PHP_URL_SCHEME );
-            $alternate_scheme = ( 'http' == $scheme ? 'https' : 'http' );
+            $scheme               = parse_url( $missing_url, PHP_URL_SCHEME );
+            $alternate_scheme     = ( 'http' == $scheme ? 'https' : 'http' );
             $alternate_scheme_url = preg_replace( "@^$scheme(?=:)@", $alternate_scheme, $missing_url );
 
-            if ( false !== ( $alternate_index = array_search( $alternate_scheme_url, $added_urls ) ) ) {
-                unset( $missing_urls[ $key ], $added_urls[ $alternate_index ] );
+            $alt_urls = [
+                // Scheme changes
+                $alternate_scheme_url,
+
+                // Slashed/unslashed changes.
+                ( '/' === substr( $missing_url, -1 )          ? rtrim( $missing_url, '/' )          : "{$missing_url}/" ),
+
+                // Scheme & Slash changes.
+                ( '/' === substr( $alternate_scheme_url, -1 ) ? rtrim( $alternate_scheme_url, '/' ) : "{$alternate_scheme_url}/" ),
+            ];
+
+            foreach ( $alt_urls as $alt_url ) {
+                if ( false !== ( $alternate_index = array_search( $alt_url, $added_urls ) ) ) {
+                    unset( $missing_urls[ $key ], $added_urls[ $alternate_index ] );
+                }
             }
         }