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

Timestamp:

11/17/2020 08:50:21 PM (6 years ago)

Author:

SergeyBiryukov

Message:

I18N: Avoid PHP notices for relative URLs in load_script_textdomain().

Props hellofromTonya, SeBsZ, archon810, nourma, justinahinon, SergeyBiryukov.
Fixes #49145.

File:

• trunk/src/wp-includes/l10n.php (modified) (3 diffs)

trunk/src/wp-includes/l10n.php

@@ -1041 +1041 @@
         if (
                 ( ! isset( $content_url['path'] ) || strpos( $src_url['path'], $content_url['path'] ) === 0 ) &&
-                ( ! isset( $src_url['host'] ) || $src_url['host'] === $content_url['host'] )
+                ( ! isset( $src_url['host'] ) || ! isset( $content_url['host'] ) || $src_url['host'] === $content_url['host'] )
         ) {
                 // Make the src relative the specific plugin or theme.
@@ -1058 +1058 @@
         } elseif (
                 ( ! isset( $plugins_url['path'] ) || strpos( $src_url['path'], $plugins_url['path'] ) === 0 ) &&
-                ( ! isset( $src_url['host'] ) || $src_url['host'] === $plugins_url['host'] )
+                ( ! isset( $src_url['host'] ) || ! isset( $plugins_url['host'] ) || $src_url['host'] === $plugins_url['host'] )
         ) {
                 // Make the src relative the specific plugin.
@@ -1073 +1073 @@
                 $relative = array_slice( $relative, 1 ); // Remove <plugin name>.
                 $relative = implode( '/', $relative );
-        } elseif ( ! isset( $src_url['host'] ) || $src_url['host'] === $site_url['host'] ) {
+        } elseif ( ! isset( $src_url['host'] ) || ! isset( $site_url['host'] ) || $src_url['host'] === $site_url['host'] ) {
                 if ( ! isset( $site_url['path'] ) ) {
                         $relative = trim( $src_url['path'], '/' );