Ticket #45103: 45103.10.diff

wp-includes/class.wp-scripts.php

@@ -528 +528 @@
                 $json_translations = load_script_textdomain( $handle, $domain, $path );
 
                 if ( ! $json_translations ) {
-                        return false;
+                        // Register an empty locale data object to ensure the domain still exists.
+                        $json_translations = '{ "locale_data": { "messages": { "": {} } } }';
                 }
 
                 $output = '(function( translations ){' .

wp-includes/l10n.php

@@ -923 +923 @@
 
                 $relative = array_slice( $relative, 2 );
                 $relative = implode( '/', $relative );
-        } else if (
-                ! isset( $site_url['path'] ) &&
-                ( ! isset( $src_url['host'] ) || $src_url['host'] !== $site_url['host'] )
-        ) {
-                $relative = trim( $src_url['path'], '/' );
-        } else if (
-                ( strpos( $src_url['path'], $site_url['path'] ) === 0 ) &&
-                ( ! isset( $src_url['host'] ) || $src_url['host'] !== $site_url['host'] )
-        ) {
-                // Make the src relative to the WP root.
-                $relative = substr( $src, strlen( $site_url['path'] ) );
-                $relative = trim( $relative, '/' );
+        } else if ( ! isset( $src_url['host'] ) || $src_url['host'] !== $site_url['host'] ) {
+                if ( ! isset( $site_url['path'] ) ) {
+                        $relative = trim( $src_url['path'], '/' );
+                } else if ( ( strpos( $src_url['path'], $site_url['path'] ) === 0 ) ) {
+                        // Make the src relative to the WP root.
+                        $relative = substr( $src, strlen( $site_url['path'] ) );
+                        $relative = trim( $relative, '/' );
+                }
         }
 
         // If the source is not from WP.