Changeset 60947

Timestamp:

10/16/2025 07:43:53 PM (4 months ago)

Author:

swissspidy

Message:

External Libraries: Backport upstream PHP 8.5 fixes for SimplePie.

After the update to v1.9.0 in [60771], this merges a single bug fix, in absence of a new upstream release in time for 6.9 Beta.

References:

• ​Original upstream PR

Props swissspidy.
Fixes #63961.

File:

• trunk/src/wp-includes/SimplePie/src/IRI.php (modified) (2 diffs)

trunk/src/wp-includes/SimplePie/src/IRI.php

@@ -171 +171 @@
         }
 
-        if ($return === null && isset($this->normalization[$this->scheme][$name])) {
+        if ($return === null && isset($this->scheme, $this->normalization[$this->scheme][$name])) {
             return $this->normalization[$this->scheme][$name];
         }
@@ -624 +624 @@
     protected function scheme_normalization()
     {
+        if ($this->scheme === null) {
+            return;
+        }
+
         if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
             $this->iuserinfo = null;