Changeset 59126 for trunk/src/wp-includes/l10n.php

Timestamp:

09/30/2024 02:57:32 PM (7 months ago)

Author:

swissspidy

Message:

I18N: Fix script languages path for themes.

Remove hardcoded path added in [57922] which ignored the fact that themes can also use script translations.
They should not be affected even if plugins are installed outside the typical wp-content/plugins location.

Props itapress, swissspidy.
Fixes #62016.

File:

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

trunk/src/wp-includes/l10n.php

@@ -1208 +1208 @@
         $relative = explode( '/', $relative );
 
-        $languages_path = WP_LANG_DIR . '/plugins';
+        /*
+         * Ensure correct languages path when using a custom `WP_PLUGIN_DIR` / `WP_PLUGIN_URL` configuration.
+         * See https://core.trac.wordpress.org/ticket/60891 and https://core.trac.wordpress.org/ticket/62016.
+         */
+        $plugins_dir = array_slice( explode( '/', $plugins_url['path'] ), 2 );
+        $plugins_dir = trim( $plugins_dir[0], '/' );
+        $dirname     = $plugins_dir === $relative[0] ? 'plugins' : 'themes';
+
+        $languages_path = WP_LANG_DIR . '/' . $dirname;
 
         $relative = array_slice( $relative, 2 ); // Remove plugins/<plugin name> or themes/<theme name>.