Changeset 44419

Timestamp:

01/07/2019 02:41:53 PM (6 years ago)

Author:

ocean90

Message:

I18N: Expose JSON translation file paths in load_script_textdomain().

Removes file_exist() checks before calling load_script_translations() to let the determined paths be passed to load_script_translations() which provides its own file check and the possibility to filter the path.

Merge of [44418] to the 5.0 branch.

Props swissspidy, johnbillion, ocean90.
Fixes #45769.

Location:

branches/5.0

Files:

• . (modified) (1 prop)
• src/wp-includes/l10n.php (modified) (2 diffs)

branches/5.0/src/wp-includes/l10n.php

@@ -898 +898 @@
     $file_base       = $domain === 'default' ? $locale : $domain . '-' . $locale;
     $handle_filename = $file_base . '-' . $handle . '.json';
-    if ( $path && file_exists( $path . '/' . $handle_filename ) ) {
-        return load_script_translations( $path . '/' . $handle_filename, $handle, $domain );
+
+    if ( $path ) {
+        $translations = load_script_translations( $path . '/' . $handle_filename, $handle, $domain );
+
+        if ( $translations ) {
+            return $translations;
+        }
     }
 
@@ -959 +964 @@
 
     $md5_filename = $file_base . '-' . md5( $relative ) . '.json';
-    if ( $path && file_exists( $path . '/' . $md5_filename ) ) {
-        return load_script_translations( $path . '/' . $md5_filename, $handle, $domain );
-    }
-    if ( file_exists( $languages_path . '/' . $md5_filename ) ) {
-        return load_script_translations( $languages_path . '/' . $md5_filename, $handle, $domain );
+
+    if ( $path ) {
+        $translations = load_script_translations( $path . '/' . $md5_filename, $handle, $domain );
+
+        if ( $translations ) {
+            return $translations;
+        }
+    }
+
+    $translations = load_script_translations( $languages_path . '/' . $md5_filename, $handle, $domain );
+
+    if ( $translations ) {
+        return $translations;
     }