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: * [https://github.com/simplepie/simplepie/pull/949 Original upstream PR] Props swissspidy. Fixes #63961. Built from https://develop.svn.wordpress.org/trunk@60947 git-svn-id: http://core.svn.wordpress.org/trunk@60283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
@@ -170,7 +170,7 @@ class IRI
|
||||
$return = null;
|
||||
}
|
||||
|
||||
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];
|
||||
}
|
||||
|
||||
@@ -623,6 +623,10 @@ class IRI
|
||||
*/
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '6.9-alpha-60946';
|
||||
$wp_version = '6.9-alpha-60947';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
||||
Reference in New Issue
Block a user