Changeset 44310

Timestamp:

12/18/2018 11:09:51 PM (6 years ago)

Author:

desrosj

Message:

I18N: Fix JavaScript translations for subdirectory installations.

Fixes the load_script_textdomain function not resolving the md5 hash based on the relative path for WordPress installations in a subdirectory. Also adds a filter to allow sites using CDNs or other alternative asset locations to filter the relative path resolution.

Props akirk, fierevere, swissspidy, mypacecreator, babaevan, tmatsuur, ocean90, herregroen.

Merges [44209] to trunk.

Fixes #45528.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/l10n.php (modified) (4 diffs)
• tests/phpunit/tests/l10n/loadScriptTextdomain.php (copied) (copied from branches/5.0/tests/phpunit/tests/l10n/loadScriptTextdomain.php)

trunk/src/wp-includes/l10n.php

@@ -913 +913 @@
     global $wp_scripts;
 
+    if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
+        return false;
+    }
+
     $path   = untrailingslashit( $path );
     $locale = determine_locale();
@@ -925 +929 @@
     $obj = $wp_scripts->registered[ $handle ];
 
+    $src = $obj->src;
+    if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $wp_scripts->content_url && 0 === strpos( $src, $wp_scripts->content_url ) ) ) {
+        $src = $wp_scripts->base_url . $src;
+    }
     /** This filter is documented in wp-includes/class.wp-scripts.php */
-    $src = esc_url( apply_filters( 'script_loader_src', $obj->src, $handle ) );
+    $src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
 
     $relative       = false;
@@ -938 +946 @@
     if (
         strpos( $src_url['path'], $content_url['path'] ) === 0 &&
-        ( ! isset( $src_url['host'] ) || $src_url['host'] !== $content_url['host'] )
+        ( ! isset( $src_url['host'] ) || $src_url['host'] === $content_url['host'] )
     ) {
         // Make the src relative the specific plugin or theme.
-        $relative = trim( substr( $src, strlen( $content_url['path'] ) ), '/' );
+        $relative = trim( substr( $src_url['path'], strlen( $content_url['path'] ) ), '/' );
         $relative = explode( '/', $relative );
 
@@ -948 +956 @@
         $relative = array_slice( $relative, 2 );
         $relative = implode( '/', $relative );
-    } elseif ( ! isset( $src_url['host'] ) || $src_url['host'] !== $site_url['host'] ) {
+    } elseif ( ! isset( $src_url['host'] ) || $src_url['host'] === $site_url['host'] ) {
         if ( ! isset( $site_url['path'] ) ) {
             $relative = trim( $src_url['path'], '/' );
-        } elseif ( ( strpos( $src_url['path'], $site_url['path'] ) === 0 ) ) {
+        } elseif ( ( strpos( $src_url['path'], trailingslashit( $site_url['path'] ) ) === 0 ) ) {
             // Make the src relative to the WP root.
-            $relative = substr( $src, strlen( $site_url['path'] ) );
+            $relative = substr( $src_url['path'], strlen( $site_url['path'] ) );
             $relative = trim( $relative, '/' );
         }
     }
+
+    /**
+     * Filters the relative path of scripts used for finding translation files.
+     *
+     * @since 5.0.2
+     *
+     * @param string $relative The relative path of the script. False if it could not be determined.
+     * @param string $src      The full source url of the script.
+     */
+    $relative = apply_filters( 'load_script_textdomain_relative_path', $relative, $src );
 
     // If the source is not from WP.