Skip to content

Commit 330deca

Browse files
committed
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: * [simplepie/simplepie#949 Original upstream PR] Props swissspidy. Fixes #63961. git-svn-id: https://develop.svn.wordpress.org/trunk@60947 602fd350-edb4-49c9-b593-d223f7449a82
1 parent d4a9939 commit 330deca

File tree

1 file changed

+5
-1
lines changed
  • src/wp-includes/SimplePie/src

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public function __get(string $name)
170170
$return = null;
171171
}
172172

173-
if ($return === null && isset($this->normalization[$this->scheme][$name])) {
173+
if ($return === null && isset($this->scheme, $this->normalization[$this->scheme][$name])) {
174174
return $this->normalization[$this->scheme][$name];
175175
}
176176

@@ -623,6 +623,10 @@ protected function remove_iunreserved_percent_encoded(array $match)
623623
*/
624624
protected function scheme_normalization()
625625
{
626+
if ($this->scheme === null) {
627+
return;
628+
}
629+
626630
if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
627631
$this->iuserinfo = null;
628632
}

0 commit comments

Comments
 (0)