Changeset 43898 for branches/5.0/src/wp-includes/l10n.php

Timestamp:

11/15/2018 02:36:39 PM (8 years ago)

Author:

herregroen

Message:

I18N: Fix warnings in JavaScript translations.

Fixes an undefined index PHP warning in the load_script_textdomain function and a non-interrupting JS error when registering a domain which has no translations.

Props omarreiss, ocean90, georgestephanis.
Fixes #45256.

File:

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

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

@@ -924 +924 @@
                 $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, '/' );
+        } 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 ) ) {
+                        // Make the src relative to the WP root.
+                        $relative = substr( $src, strlen( $site_url['path'] ) );
+                        $relative = trim( $relative, '/' );
+                }
         }