<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[59141] trunk/src/wp-includes: External Libraries: Update the SimplePie library to version 1.8.0.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/59141">59141</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/59141","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-09-30 22:48:16 +0000 (Mon, 30 Sep 2024)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>External Libraries: Update the SimplePie library to version 1.8.0.

The most notable change in this update is that all code is now namespaced and uses PSR-4 classes, though there is a compatibility layer available for extenders using the older class names, so plugin or theme authors directly using SimplePie can decide for themselves when they want to change to using the namespaced names for SimplePie classes.

Note: This commit includes additional fixes for PHP 8.4 compatibility ([https://github.com/simplepie/simplepie/pull/875 PR 875], [https://github.com/simplepie/simplepie/pull/888 PR 888]) from the `one-dot-eight` branch of SimplePie, which is expected to be [https://github.com/simplepie/simplepie/pull/886 released as SimplePie 1.8.1] soon.

References:
* [https://github.com/simplepie/simplepie/releases/tag/1.8.0 SimplePie 1.8.0 release notes]
* [https://github.com/simplepie/simplepie/releases/tag/1.7.0 SimplePie 1.7.0 release notes]
* [https://github.com/simplepie/simplepie/releases/tag/1.6.0 SimplePie 1.6.0 release notes]
* [https://github.com/simplepie/simplepie/compare/1.5.8...1.8.0 Full list of changes in SimplePie 1.8.0]

Follow-up to <a href="https://core.trac.wordpress.org/changeset/47733">[47733]</a>, <a href="https://core.trac.wordpress.org/changeset/49176">[49176]</a>, <a href="https://core.trac.wordpress.org/changeset/52393">[52393]</a>, <a href="https://core.trac.wordpress.org/changeset/52413">[52413]</a>.

Props jrf, peterwilsoncc, chaion07, cu121, markparnell, audrasjb, costdev, Presskopp, desrosj, faisal03, mukesh27, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/55604">#55604</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheBasephp">trunk/src/wp-includes/SimplePie/src/Cache/Base.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheDBphp">trunk/src/wp-includes/SimplePie/src/Cache/DB.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheFilephp">trunk/src/wp-includes/SimplePie/src/Cache/File.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheMemcachephp">trunk/src/wp-includes/SimplePie/src/Cache/Memcache.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheMemcachedphp">trunk/src/wp-includes/SimplePie/src/Cache/Memcached.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheMySQLphp">trunk/src/wp-includes/SimplePie/src/Cache/MySQL.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheRedisphp">trunk/src/wp-includes/SimplePie/src/Cache/Redis.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcContentTypeSnifferphp">trunk/src/wp-includes/SimplePie/src/Content/Type/Sniffer.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcHTTPParserphp">trunk/src/wp-includes/SimplePie/src/HTTP/Parser.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcNetIPv6php">trunk/src/wp-includes/SimplePie/src/Net/IPv6.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcParseDatephp">trunk/src/wp-includes/SimplePie/src/Parse/Date.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcXMLDeclarationParserphp">trunk/src/wp-includes/SimplePie/src/XML/Declaration/Parser.php</a></li>
<li><a href="#trunksrcwpincludesclassfeedphp">trunk/src/wp-includes/class-feed.php</a></li>
<li><a href="#trunksrcwpincludesclasssimplepiephp">trunk/src/wp-includes/class-simplepie.php</a></li>
<li><a href="#trunksrcwpincludesclasswpfeedcachetransientphp">trunk/src/wp-includes/class-wp-feed-cache-transient.php</a></li>
<li><a href="#trunksrcwpincludesclasswpfeedcachephp">trunk/src/wp-includes/class-wp-feed-cache.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsimplepiefilephp">trunk/src/wp-includes/class-wp-simplepie-file.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsimplepiesanitizeksesphp">trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesSimplePieautoloaderphp">trunk/src/wp-includes/SimplePie/autoloader.php</a></li>
<li>trunk/src/wp-includes/SimplePie/library/</li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/</li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieAuthorphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Author.php</a></li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/</li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCacheBasephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Base.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCacheDBphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/DB.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCacheFilephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/File.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCacheMemcachephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcache.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCacheMemcachedphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcached.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCacheMySQLphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/MySQL.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCacheRedisphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Redis.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCachephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Cache.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCaptionphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Caption.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCategoryphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Category.php</a></li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/Content/</li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/Content/Type/</li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieContentTypeSnifferphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Content/Type/Sniffer.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCopyrightphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Copyright.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCorephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Core.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieCreditphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Credit.php</a></li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/Decode/</li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/Decode/HTML/</li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieDecodeHTMLEntitiesphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Decode/HTML/Entities.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieEnclosurephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Enclosure.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieExceptionphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Exception.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieFilephp">trunk/src/wp-includes/SimplePie/library/SimplePie/File.php</a></li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/HTTP/</li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieHTTPParserphp">trunk/src/wp-includes/SimplePie/library/SimplePie/HTTP/Parser.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieIRIphp">trunk/src/wp-includes/SimplePie/library/SimplePie/IRI.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieItemphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Item.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieLocatorphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Locator.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieMiscphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Misc.php</a></li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/Net/</li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieNetIPv6php">trunk/src/wp-includes/SimplePie/library/SimplePie/Net/IPv6.php</a></li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/Parse/</li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieParseDatephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Parse/Date.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieParserphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Parser.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieRatingphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Rating.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieRegistryphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Registry.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieRestrictionphp">trunk/src/wp-includes/SimplePie/library/SimplePie/Restriction.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieSanitizephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Sanitize.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieSourcephp">trunk/src/wp-includes/SimplePie/library/SimplePie/Source.php</a></li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/XML/</li>
<li>trunk/src/wp-includes/SimplePie/library/SimplePie/XML/Declaration/</li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePieXMLDeclarationParserphp">trunk/src/wp-includes/SimplePie/library/SimplePie/XML/Declaration/Parser.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePiegzdecodephp">trunk/src/wp-includes/SimplePie/library/SimplePie/gzdecode.php</a></li>
<li><a href="#trunksrcwpincludesSimplePielibrarySimplePiephp">trunk/src/wp-includes/SimplePie/library/SimplePie.php</a></li>
<li>trunk/src/wp-includes/SimplePie/src/</li>
<li><a href="#trunksrcwpincludesSimplePiesrcAuthorphp">trunk/src/wp-includes/SimplePie/src/Author.php</a></li>
<li>trunk/src/wp-includes/SimplePie/src/Cache/</li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheBaseDataCachephp">trunk/src/wp-includes/SimplePie/src/Cache/BaseDataCache.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheCallableNameFilterphp">trunk/src/wp-includes/SimplePie/src/Cache/CallableNameFilter.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheDataCachephp">trunk/src/wp-includes/SimplePie/src/Cache/DataCache.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCacheNameFilterphp">trunk/src/wp-includes/SimplePie/src/Cache/NameFilter.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCachePsr16php">trunk/src/wp-includes/SimplePie/src/Cache/Psr16.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCachephp">trunk/src/wp-includes/SimplePie/src/Cache.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCaptionphp">trunk/src/wp-includes/SimplePie/src/Caption.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCategoryphp">trunk/src/wp-includes/SimplePie/src/Category.php</a></li>
<li>trunk/src/wp-includes/SimplePie/src/Content/</li>
<li><a href="#trunksrcwpincludesSimplePiesrcCopyrightphp">trunk/src/wp-includes/SimplePie/src/Copyright.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCorephp">trunk/src/wp-includes/SimplePie/src/Core.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcCreditphp">trunk/src/wp-includes/SimplePie/src/Credit.php</a></li>
<li>trunk/src/wp-includes/SimplePie/src/Decode/</li>
<li><a href="#trunksrcwpincludesSimplePiesrcEnclosurephp">trunk/src/wp-includes/SimplePie/src/Enclosure.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcExceptionphp">trunk/src/wp-includes/SimplePie/src/Exception.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcFilephp">trunk/src/wp-includes/SimplePie/src/File.php</a></li>
<li>trunk/src/wp-includes/SimplePie/src/HTTP/</li>
<li><a href="#trunksrcwpincludesSimplePiesrcIRIphp">trunk/src/wp-includes/SimplePie/src/IRI.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcItemphp">trunk/src/wp-includes/SimplePie/src/Item.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcLocatorphp">trunk/src/wp-includes/SimplePie/src/Locator.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcMiscphp">trunk/src/wp-includes/SimplePie/src/Misc.php</a></li>
<li>trunk/src/wp-includes/SimplePie/src/Net/</li>
<li>trunk/src/wp-includes/SimplePie/src/Parse/</li>
<li><a href="#trunksrcwpincludesSimplePiesrcParserphp">trunk/src/wp-includes/SimplePie/src/Parser.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcRatingphp">trunk/src/wp-includes/SimplePie/src/Rating.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcRegistryphp">trunk/src/wp-includes/SimplePie/src/Registry.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcRegistryAwarephp">trunk/src/wp-includes/SimplePie/src/RegistryAware.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcRestrictionphp">trunk/src/wp-includes/SimplePie/src/Restriction.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcSanitizephp">trunk/src/wp-includes/SimplePie/src/Sanitize.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcSimplePiephp">trunk/src/wp-includes/SimplePie/src/SimplePie.php</a></li>
<li><a href="#trunksrcwpincludesSimplePiesrcSourcephp">trunk/src/wp-includes/SimplePie/src/Source.php</a></li>
<li>trunk/src/wp-includes/SimplePie/src/XML/</li>
<li><a href="#trunksrcwpincludesSimplePiesrcgzdecodephp">trunk/src/wp-includes/SimplePie/src/gzdecode.php</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesSimplePieAuthorphp">trunk/src/wp-includes/SimplePie/Author.php</a></li>
<li>trunk/src/wp-includes/SimplePie/Cache/</li>
<li><a href="#trunksrcwpincludesSimplePieCachephp">trunk/src/wp-includes/SimplePie/Cache.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieCaptionphp">trunk/src/wp-includes/SimplePie/Caption.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieCategoryphp">trunk/src/wp-includes/SimplePie/Category.php</a></li>
<li>trunk/src/wp-includes/SimplePie/Content/</li>
<li><a href="#trunksrcwpincludesSimplePieCopyrightphp">trunk/src/wp-includes/SimplePie/Copyright.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieCorephp">trunk/src/wp-includes/SimplePie/Core.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieCreditphp">trunk/src/wp-includes/SimplePie/Credit.php</a></li>
<li>trunk/src/wp-includes/SimplePie/Decode/</li>
<li><a href="#trunksrcwpincludesSimplePieEnclosurephp">trunk/src/wp-includes/SimplePie/Enclosure.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieExceptionphp">trunk/src/wp-includes/SimplePie/Exception.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieFilephp">trunk/src/wp-includes/SimplePie/File.php</a></li>
<li>trunk/src/wp-includes/SimplePie/HTTP/</li>
<li><a href="#trunksrcwpincludesSimplePieIRIphp">trunk/src/wp-includes/SimplePie/IRI.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieItemphp">trunk/src/wp-includes/SimplePie/Item.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieLocatorphp">trunk/src/wp-includes/SimplePie/Locator.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieMiscphp">trunk/src/wp-includes/SimplePie/Misc.php</a></li>
<li>trunk/src/wp-includes/SimplePie/Net/</li>
<li>trunk/src/wp-includes/SimplePie/Parse/</li>
<li><a href="#trunksrcwpincludesSimplePieParserphp">trunk/src/wp-includes/SimplePie/Parser.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieRatingphp">trunk/src/wp-includes/SimplePie/Rating.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieRegistryphp">trunk/src/wp-includes/SimplePie/Registry.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieRestrictionphp">trunk/src/wp-includes/SimplePie/Restriction.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieSanitizephp">trunk/src/wp-includes/SimplePie/Sanitize.php</a></li>
<li><a href="#trunksrcwpincludesSimplePieSourcephp">trunk/src/wp-includes/SimplePie/Source.php</a></li>
<li>trunk/src/wp-includes/SimplePie/XML/</li>
<li><a href="#trunksrcwpincludesSimplePiegzdecodephp">trunk/src/wp-includes/SimplePie/gzdecode.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesSimplePieAuthorphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Author.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Author.php        2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Author.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,149 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Manages all author-related data
- *
- * Used by {@see SimplePie_Item::get_author()} and {@see SimplePie::get_authors()}
- *
- * This class can be overloaded with {@see SimplePie::set_author_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Author
-{
-       /**
-        * Author's name
-        *
-        * @var string
-        * @see get_name()
-        */
-       var $name;
-
-       /**
-        * Author's link
-        *
-        * @var string
-        * @see get_link()
-        */
-       var $link;
-
-       /**
-        * Author's email address
-        *
-        * @var string
-        * @see get_email()
-        */
-       var $email;
-
-       /**
-        * Constructor, used to input the data
-        *
-        * @param string $name
-        * @param string $link
-        * @param string $email
-        */
-       public function __construct($name = null, $link = null, $email = null)
-       {
-               $this->name = $name;
-               $this->link = $link;
-               $this->email = $email;
-       }
-
-       /**
-        * String-ified version
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               // There is no $this->data here
-               return md5(serialize($this));
-       }
-
-       /**
-        * Author's name
-        *
-        * @return string|null
-        */
-       public function get_name()
-       {
-               if ($this->name !== null)
-               {
-                       return $this->name;
-               }
-
-               return null;
-       }
-
-       /**
-        * Author's link
-        *
-        * @return string|null
-        */
-       public function get_link()
-       {
-               if ($this->link !== null)
-               {
-                       return $this->link;
-               }
-
-               return null;
-       }
-
-       /**
-        * Author's email address
-        *
-        * @return string|null
-        */
-       public function get_email()
-       {
-               if ($this->email !== null)
-               {
-                       return $this->email;
-               }
-
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieCachephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Cache.php 2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Cache.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,134 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Used to create cache objects
- *
- * This class can be overloaded with {@see SimplePie::set_cache_class()},
- * although the preferred way is to create your own handler
- * via {@see register()}
- *
- * @package SimplePie
- * @subpackage Caching
- */
-class SimplePie_Cache
-{
-       /**
-        * Cache handler classes
-        *
-        * These receive 3 parameters to their constructor, as documented in
-        * {@see register()}
-        * @var array
-        */
-       protected static $handlers = array(
-               'mysql'     => 'SimplePie_Cache_MySQL',
-               'memcache'  => 'SimplePie_Cache_Memcache',
-               'memcached' => 'SimplePie_Cache_Memcached',
-               'redis'     => 'SimplePie_Cache_Redis'
-       );
-
-       /**
-        * Don't call the constructor. Please.
-        */
-       private function __construct() { }
-
-       /**
-        * Create a new SimplePie_Cache object
-        *
-        * @param string $location URL location (scheme is used to determine handler)
-        * @param string $filename Unique identifier for cache object
-        * @param string $extension 'spi' or 'spc'
-        * @return SimplePie_Cache_Base Type of object depends on scheme of `$location`
-        */
-       public static function get_handler($location, $filename, $extension)
-       {
-               $type = explode(':', $location, 2);
-               $type = $type[0];
-               if (!empty(self::$handlers[$type]))
-               {
-                       $class = self::$handlers[$type];
-                       return new $class($location, $filename, $extension);
-               }
-
-               return new SimplePie_Cache_File($location, $filename, $extension);
-       }
-
-       /**
-        * Create a new SimplePie_Cache object
-        *
-        * @deprecated Use {@see get_handler} instead
-        */
-       public function create($location, $filename, $extension)
-       {
-               trigger_error('Cache::create() has been replaced with Cache::get_handler(). Switch to the registry system to use this.', E_USER_DEPRECATED);
-               return self::get_handler($location, $filename, $extension);
-       }
-
-       /**
-        * Register a handler
-        *
-        * @param string $type DSN type to register for
-        * @param string $class Name of handler class. Must implement SimplePie_Cache_Base
-        */
-       public static function register($type, $class)
-       {
-               self::$handlers[$type] = $class;
-       }
-
-       /**
-        * Parse a URL into an array
-        *
-        * @param string $url
-        * @return array
-        */
-       public static function parse_URL($url)
-       {
-               $params = parse_url($url);
-               $params['extras'] = array();
-               if (isset($params['query']))
-               {
-                       parse_str($params['query'], $params['extras']);
-               }
-               return $params;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieCaptionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Caption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Caption.php       2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Caption.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,198 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-
-/**
- * Handles `<media:text>` captions as defined in Media RSS.
- *
- * Used by {@see SimplePie_Enclosure::get_caption()} and {@see SimplePie_Enclosure::get_captions()}
- *
- * This class can be overloaded with {@see SimplePie::set_caption_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Caption
-{
-       /**
-        * Content type
-        *
-        * @var string
-        * @see get_type()
-        */
-       var $type;
-
-       /**
-        * Language
-        *
-        * @var string
-        * @see get_language()
-        */
-       var $lang;
-
-       /**
-        * Start time
-        *
-        * @var string
-        * @see get_starttime()
-        */
-       var $startTime;
-
-       /**
-        * End time
-        *
-        * @var string
-        * @see get_endtime()
-        */
-       var $endTime;
-
-       /**
-        * Caption text
-        *
-        * @var string
-        * @see get_text()
-        */
-       var $text;
-
-       /**
-        * Constructor, used to input the data
-        *
-        * For documentation on all the parameters, see the corresponding
-        * properties and their accessors
-        */
-       public function __construct($type = null, $lang = null, $startTime = null, $endTime = null, $text = null)
-       {
-               $this->type = $type;
-               $this->lang = $lang;
-               $this->startTime = $startTime;
-               $this->endTime = $endTime;
-               $this->text = $text;
-       }
-
-       /**
-        * String-ified version
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               // There is no $this->data here
-               return md5(serialize($this));
-       }
-
-       /**
-        * Get the end time
-        *
-        * @return string|null Time in the format 'hh:mm:ss.SSS'
-        */
-       public function get_endtime()
-       {
-               if ($this->endTime !== null)
-               {
-                       return $this->endTime;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the language
-        *
-        * @link http://tools.ietf.org/html/rfc3066
-        * @return string|null Language code as per RFC 3066
-        */
-       public function get_language()
-       {
-               if ($this->lang !== null)
-               {
-                       return $this->lang;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the start time
-        *
-        * @return string|null Time in the format 'hh:mm:ss.SSS'
-        */
-       public function get_starttime()
-       {
-               if ($this->startTime !== null)
-               {
-                       return $this->startTime;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the text of the caption
-        *
-        * @return string|null
-        */
-       public function get_text()
-       {
-               if ($this->text !== null)
-               {
-                       return $this->text;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the content type (not MIME type)
-        *
-        * @return string|null Either 'text' or 'html'
-        */
-       public function get_type()
-       {
-               if ($this->type !== null)
-               {
-                       return $this->type;
-               }
-
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieCategoryphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Category.php      2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Category.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,163 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Manages all category-related data
- *
- * Used by {@see SimplePie_Item::get_category()} and {@see SimplePie_Item::get_categories()}
- *
- * This class can be overloaded with {@see SimplePie::set_category_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Category
-{
-       /**
-        * Category identifier
-        *
-        * @var string|null
-        * @see get_term
-        */
-       var $term;
-
-       /**
-        * Categorization scheme identifier
-        *
-        * @var string|null
-        * @see get_scheme()
-        */
-       var $scheme;
-
-       /**
-        * Human readable label
-        *
-        * @var string|null
-        * @see get_label()
-        */
-       var $label;
-
-       /**
-        * Category type
-        * 
-        * category for <category>
-        * subject for <dc:subject>
-        *
-        * @var string|null
-        * @see get_type()
-        */
-       var $type;
-
-       /**
-        * Constructor, used to input the data
-        *
-        * @param string|null $term
-        * @param string|null $scheme
-        * @param string|null $label
-        * @param string|null $type
-        */
-       public function __construct($term = null, $scheme = null, $label = null, $type = null)
-       {
-               $this->term = $term;
-               $this->scheme = $scheme;
-               $this->label = $label;
-               $this->type = $type;
-       }
-
-       /**
-        * String-ified version
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               // There is no $this->data here
-               return md5(serialize($this));
-       }
-
-       /**
-        * Get the category identifier
-        *
-        * @return string|null
-        */
-       public function get_term()
-       {
-               return $this->term;
-       }
-
-       /**
-        * Get the categorization scheme identifier
-        *
-        * @return string|null
-        */
-       public function get_scheme()
-       {
-               return $this->scheme;
-       }
-
-       /**
-        * Get the human readable label
-        *
-        * @param bool $strict
-        * @return string|null
-        */
-       public function get_label($strict = false)
-       {
-               if ($this->label === null && $strict !== true)
-               {
-                       return $this->get_term();
-               }
-               return $this->label;
-       }
-
-       /**
-        * Get the category type
-        *
-        * @return string|null
-        */
-       public function get_type()
-       {
-               return $this->type;
-       }
-}
-
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieCopyrightphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Copyright.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Copyright.php     2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Copyright.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,124 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Manages `<media:copyright>` copyright tags as defined in Media RSS
- *
- * Used by {@see SimplePie_Enclosure::get_copyright()}
- *
- * This class can be overloaded with {@see SimplePie::set_copyright_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Copyright
-{
-       /**
-        * Copyright URL
-        *
-        * @var string
-        * @see get_url()
-        */
-       var $url;
-
-       /**
-        * Attribution
-        *
-        * @var string
-        * @see get_attribution()
-        */
-       var $label;
-
-       /**
-        * Constructor, used to input the data
-        *
-        * For documentation on all the parameters, see the corresponding
-        * properties and their accessors
-        */
-       public function __construct($url = null, $label = null)
-       {
-               $this->url = $url;
-               $this->label = $label;
-       }
-
-       /**
-        * String-ified version
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               // There is no $this->data here
-               return md5(serialize($this));
-       }
-
-       /**
-        * Get the copyright URL
-        *
-        * @return string|null URL to copyright information
-        */
-       public function get_url()
-       {
-               if ($this->url !== null)
-               {
-                       return $this->url;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the attribution text
-        *
-        * @return string|null
-        */
-       public function get_attribution()
-       {
-               if ($this->label !== null)
-               {
-                       return $this->label;
-               }
-
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieCorephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Core.php  2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Core.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,56 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * SimplePie class.
- *
- * Class for backward compatibility.
- *
- * @deprecated Use {@see SimplePie} directly
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Core extends SimplePie
-{
-
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesSimplePieCreditphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Credit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Credit.php        2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Credit.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,148 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Handles `<media:credit>` as defined in Media RSS
- *
- * Used by {@see SimplePie_Enclosure::get_credit()} and {@see SimplePie_Enclosure::get_credits()}
- *
- * This class can be overloaded with {@see SimplePie::set_credit_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Credit
-{
-       /**
-        * Credited role
-        *
-        * @var string
-        * @see get_role()
-        */
-       var $role;
-
-       /**
-        * Organizational scheme
-        *
-        * @var string
-        * @see get_scheme()
-        */
-       var $scheme;
-
-       /**
-        * Credited name
-        *
-        * @var string
-        * @see get_name()
-        */
-       var $name;
-
-       /**
-        * Constructor, used to input the data
-        *
-        * For documentation on all the parameters, see the corresponding
-        * properties and their accessors
-        */
-       public function __construct($role = null, $scheme = null, $name = null)
-       {
-               $this->role = $role;
-               $this->scheme = $scheme;
-               $this->name = $name;
-       }
-
-       /**
-        * String-ified version
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               // There is no $this->data here
-               return md5(serialize($this));
-       }
-
-       /**
-        * Get the role of the person receiving credit
-        *
-        * @return string|null
-        */
-       public function get_role()
-       {
-               if ($this->role !== null)
-               {
-                       return $this->role;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the organizational scheme
-        *
-        * @return string|null
-        */
-       public function get_scheme()
-       {
-               if ($this->scheme !== null)
-               {
-                       return $this->scheme;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the credited person/entity's name
-        *
-        * @return string|null
-        */
-       public function get_name()
-       {
-               if ($this->name !== null)
-               {
-                       return $this->name;
-               }
-
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieEnclosurephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Enclosure.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Enclosure.php     2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Enclosure.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,1309 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Handles everything related to enclosures (including Media RSS and iTunes RSS)
- *
- * Used by {@see SimplePie_Item::get_enclosure()} and {@see SimplePie_Item::get_enclosures()}
- *
- * This class can be overloaded with {@see SimplePie::set_enclosure_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Enclosure
-{
-       /**
-        * @var string
-        * @see get_bitrate()
-        */
-       var $bitrate;
-
-       /**
-        * @var array
-        * @see get_captions()
-        */
-       var $captions;
-
-       /**
-        * @var array
-        * @see get_categories()
-        */
-       var $categories;
-
-       /**
-        * @var int
-        * @see get_channels()
-        */
-       var $channels;
-
-       /**
-        * @var SimplePie_Copyright
-        * @see get_copyright()
-        */
-       var $copyright;
-
-       /**
-        * @var array
-        * @see get_credits()
-        */
-       var $credits;
-
-       /**
-        * @var string
-        * @see get_description()
-        */
-       var $description;
-
-       /**
-        * @var int
-        * @see get_duration()
-        */
-       var $duration;
-
-       /**
-        * @var string
-        * @see get_expression()
-        */
-       var $expression;
-
-       /**
-        * @var string
-        * @see get_framerate()
-        */
-       var $framerate;
-
-       /**
-        * @var string
-        * @see get_handler()
-        */
-       var $handler;
-
-       /**
-        * @var array
-        * @see get_hashes()
-        */
-       var $hashes;
-
-       /**
-        * @var string
-        * @see get_height()
-        */
-       var $height;
-
-       /**
-        * @deprecated
-        * @var null
-        */
-       var $javascript;
-
-       /**
-        * @var array
-        * @see get_keywords()
-        */
-       var $keywords;
-
-       /**
-        * @var string
-        * @see get_language()
-        */
-       var $lang;
-
-       /**
-        * @var string
-        * @see get_length()
-        */
-       var $length;
-
-       /**
-        * @var string
-        * @see get_link()
-        */
-       var $link;
-
-       /**
-        * @var string
-        * @see get_medium()
-        */
-       var $medium;
-
-       /**
-        * @var string
-        * @see get_player()
-        */
-       var $player;
-
-       /**
-        * @var array
-        * @see get_ratings()
-        */
-       var $ratings;
-
-       /**
-        * @var array
-        * @see get_restrictions()
-        */
-       var $restrictions;
-
-       /**
-        * @var string
-        * @see get_sampling_rate()
-        */
-       var $samplingrate;
-
-       /**
-        * @var array
-        * @see get_thumbnails()
-        */
-       var $thumbnails;
-
-       /**
-        * @var string
-        * @see get_title()
-        */
-       var $title;
-
-       /**
-        * @var string
-        * @see get_type()
-        */
-       var $type;
-
-       /**
-        * @var string
-        * @see get_width()
-        */
-       var $width;
-
-       /**
-        * Constructor, used to input the data
-        *
-        * For documentation on all the parameters, see the corresponding
-        * properties and their accessors
-        *
-        * @uses idna_convert If available, this will convert an IDN
-        */
-       public function __construct($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
-       {
-               $this->bitrate = $bitrate;
-               $this->captions = $captions;
-               $this->categories = $categories;
-               $this->channels = $channels;
-               $this->copyright = $copyright;
-               $this->credits = $credits;
-               $this->description = $description;
-               $this->duration = $duration;
-               $this->expression = $expression;
-               $this->framerate = $framerate;
-               $this->hashes = $hashes;
-               $this->height = $height;
-               $this->keywords = $keywords;
-               $this->lang = $lang;
-               $this->length = $length;
-               $this->link = $link;
-               $this->medium = $medium;
-               $this->player = $player;
-               $this->ratings = $ratings;
-               $this->restrictions = $restrictions;
-               $this->samplingrate = $samplingrate;
-               $this->thumbnails = $thumbnails;
-               $this->title = $title;
-               $this->type = $type;
-               $this->width = $width;
-
-               if (class_exists('idna_convert'))
-               {
-                       $idn = new idna_convert();
-                       $parsed = SimplePie_Misc::parse_url($link);
-                       $this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
-               }
-               $this->handler = $this->get_handler(); // Needs to load last
-       }
-
-       /**
-        * String-ified version
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               // There is no $this->data here
-               return md5(serialize($this));
-       }
-
-       /**
-        * Get the bitrate
-        *
-        * @return string|null
-        */
-       public function get_bitrate()
-       {
-               if ($this->bitrate !== null)
-               {
-                       return $this->bitrate;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single caption
-        *
-        * @param int $key
-        * @return SimplePie_Caption|null
-        */
-       public function get_caption($key = 0)
-       {
-               $captions = $this->get_captions();
-               if (isset($captions[$key]))
-               {
-                       return $captions[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all captions
-        *
-        * @return array|null Array of {@see SimplePie_Caption} objects
-        */
-       public function get_captions()
-       {
-               if ($this->captions !== null)
-               {
-                       return $this->captions;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single category
-        *
-        * @param int $key
-        * @return SimplePie_Category|null
-        */
-       public function get_category($key = 0)
-       {
-               $categories = $this->get_categories();
-               if (isset($categories[$key]))
-               {
-                       return $categories[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all categories
-        *
-        * @return array|null Array of {@see SimplePie_Category} objects
-        */
-       public function get_categories()
-       {
-               if ($this->categories !== null)
-               {
-                       return $this->categories;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the number of audio channels
-        *
-        * @return int|null
-        */
-       public function get_channels()
-       {
-               if ($this->channels !== null)
-               {
-                       return $this->channels;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the copyright information
-        *
-        * @return SimplePie_Copyright|null
-        */
-       public function get_copyright()
-       {
-               if ($this->copyright !== null)
-               {
-                       return $this->copyright;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single credit
-        *
-        * @param int $key
-        * @return SimplePie_Credit|null
-        */
-       public function get_credit($key = 0)
-       {
-               $credits = $this->get_credits();
-               if (isset($credits[$key]))
-               {
-                       return $credits[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all credits
-        *
-        * @return array|null Array of {@see SimplePie_Credit} objects
-        */
-       public function get_credits()
-       {
-               if ($this->credits !== null)
-               {
-                       return $this->credits;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the description of the enclosure
-        *
-        * @return string|null
-        */
-       public function get_description()
-       {
-               if ($this->description !== null)
-               {
-                       return $this->description;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the duration of the enclosure
-        *
-        * @param bool $convert Convert seconds into hh:mm:ss
-        * @return string|int|null 'hh:mm:ss' string if `$convert` was specified, otherwise integer (or null if none found)
-        */
-       public function get_duration($convert = false)
-       {
-               if ($this->duration !== null)
-               {
-                       if ($convert)
-                       {
-                               $time = SimplePie_Misc::time_hms($this->duration);
-                               return $time;
-                       }
-
-                       return $this->duration;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the expression
-        *
-        * @return string Probably one of 'sample', 'full', 'nonstop', 'clip'. Defaults to 'full'
-        */
-       public function get_expression()
-       {
-               if ($this->expression !== null)
-               {
-                       return $this->expression;
-               }
-
-               return 'full';
-       }
-
-       /**
-        * Get the file extension
-        *
-        * @return string|null
-        */
-       public function get_extension()
-       {
-               if ($this->link !== null)
-               {
-                       $url = SimplePie_Misc::parse_url($this->link);
-                       if ($url['path'] !== '')
-                       {
-                               return pathinfo($url['path'], PATHINFO_EXTENSION);
-                       }
-               }
-               return null;
-       }
-
-       /**
-        * Get the framerate (in frames-per-second)
-        *
-        * @return string|null
-        */
-       public function get_framerate()
-       {
-               if ($this->framerate !== null)
-               {
-                       return $this->framerate;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the preferred handler
-        *
-        * @return string|null One of 'flash', 'fmedia', 'quicktime', 'wmedia', 'mp3'
-        */
-       public function get_handler()
-       {
-               return $this->get_real_type(true);
-       }
-
-       /**
-        * Get a single hash
-        *
-        * @link http://www.rssboard.org/media-rss#media-hash
-        * @param int $key
-        * @return string|null Hash as per `media:hash`, prefixed with "$algo:"
-        */
-       public function get_hash($key = 0)
-       {
-               $hashes = $this->get_hashes();
-               if (isset($hashes[$key]))
-               {
-                       return $hashes[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all credits
-        *
-        * @return array|null Array of strings, see {@see get_hash()}
-        */
-       public function get_hashes()
-       {
-               if ($this->hashes !== null)
-               {
-                       return $this->hashes;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the height
-        *
-        * @return string|null
-        */
-       public function get_height()
-       {
-               if ($this->height !== null)
-               {
-                       return $this->height;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the language
-        *
-        * @link http://tools.ietf.org/html/rfc3066
-        * @return string|null Language code as per RFC 3066
-        */
-       public function get_language()
-       {
-               if ($this->lang !== null)
-               {
-                       return $this->lang;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single keyword
-        *
-        * @param int $key
-        * @return string|null
-        */
-       public function get_keyword($key = 0)
-       {
-               $keywords = $this->get_keywords();
-               if (isset($keywords[$key]))
-               {
-                       return $keywords[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all keywords
-        *
-        * @return array|null Array of strings
-        */
-       public function get_keywords()
-       {
-               if ($this->keywords !== null)
-               {
-                       return $this->keywords;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get length
-        *
-        * @return float Length in bytes
-        */
-       public function get_length()
-       {
-               if ($this->length !== null)
-               {
-                       return $this->length;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the URL
-        *
-        * @return string|null
-        */
-       public function get_link()
-       {
-               if ($this->link !== null)
-               {
-                       return urldecode($this->link);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the medium
-        *
-        * @link http://www.rssboard.org/media-rss#media-content
-        * @return string|null Should be one of 'image', 'audio', 'video', 'document', 'executable'
-        */
-       public function get_medium()
-       {
-               if ($this->medium !== null)
-               {
-                       return $this->medium;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the player URL
-        *
-        * Typically the same as {@see get_permalink()}
-        * @return string|null Player URL
-        */
-       public function get_player()
-       {
-               if ($this->player !== null)
-               {
-                       return $this->player;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single rating
-        *
-        * @param int $key
-        * @return SimplePie_Rating|null
-        */
-       public function get_rating($key = 0)
-       {
-               $ratings = $this->get_ratings();
-               if (isset($ratings[$key]))
-               {
-                       return $ratings[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all ratings
-        *
-        * @return array|null Array of {@see SimplePie_Rating} objects
-        */
-       public function get_ratings()
-       {
-               if ($this->ratings !== null)
-               {
-                       return $this->ratings;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single restriction
-        *
-        * @param int $key
-        * @return SimplePie_Restriction|null
-        */
-       public function get_restriction($key = 0)
-       {
-               $restrictions = $this->get_restrictions();
-               if (isset($restrictions[$key]))
-               {
-                       return $restrictions[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all restrictions
-        *
-        * @return array|null Array of {@see SimplePie_Restriction} objects
-        */
-       public function get_restrictions()
-       {
-               if ($this->restrictions !== null)
-               {
-                       return $this->restrictions;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the sampling rate (in kHz)
-        *
-        * @return string|null
-        */
-       public function get_sampling_rate()
-       {
-               if ($this->samplingrate !== null)
-               {
-                       return $this->samplingrate;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the file size (in MiB)
-        *
-        * @return float|null File size in mebibytes (1048 bytes)
-        */
-       public function get_size()
-       {
-               $length = $this->get_length();
-               if ($length !== null)
-               {
-                       return round($length/1048576, 2);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single thumbnail
-        *
-        * @param int $key
-        * @return string|null Thumbnail URL
-        */
-       public function get_thumbnail($key = 0)
-       {
-               $thumbnails = $this->get_thumbnails();
-               if (isset($thumbnails[$key]))
-               {
-                       return $thumbnails[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all thumbnails
-        *
-        * @return array|null Array of thumbnail URLs
-        */
-       public function get_thumbnails()
-       {
-               if ($this->thumbnails !== null)
-               {
-                       return $this->thumbnails;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the title
-        *
-        * @return string|null
-        */
-       public function get_title()
-       {
-               if ($this->title !== null)
-               {
-                       return $this->title;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get mimetype of the enclosure
-        *
-        * @see get_real_type()
-        * @return string|null MIME type
-        */
-       public function get_type()
-       {
-               if ($this->type !== null)
-               {
-                       return $this->type;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the width
-        *
-        * @return string|null
-        */
-       public function get_width()
-       {
-               if ($this->width !== null)
-               {
-                       return $this->width;
-               }
-
-               return null;
-       }
-
-       /**
-        * Embed the enclosure using `<embed>`
-        *
-        * @deprecated Use the second parameter to {@see embed} instead
-        *
-        * @param array|string $options See first paramter to {@see embed}
-        * @return string HTML string to output
-        */
-       public function native_embed($options='')
-       {
-               return $this->embed($options, true);
-       }
-
-       /**
-        * Embed the enclosure using Javascript
-        *
-        * `$options` is an array or comma-separated key:value string, with the
-        * following properties:
-        *
-        * - `alt` (string): Alternate content for when an end-user does not have
-        *    the appropriate handler installed or when a file type is
-        *    unsupported. Can be any text or HTML. Defaults to blank.
-        * - `altclass` (string): If a file type is unsupported, the end-user will
-        *    see the alt text (above) linked directly to the content. That link
-        *    will have this value as its class name. Defaults to blank.
-        * - `audio` (string): This is an image that should be used as a
-        *    placeholder for audio files before they're loaded (QuickTime-only).
-        *    Can be any relative or absolute URL. Defaults to blank.
-        * - `bgcolor` (string): The background color for the media, if not
-        *    already transparent. Defaults to `#ffffff`.
-        * - `height` (integer): The height of the embedded media. Accepts any
-        *    numeric pixel value (such as `360`) or `auto`. Defaults to `auto`,
-        *    and it is recommended that you use this default.
-        * - `loop` (boolean): Do you want the media to loop when it's done?
-        *    Defaults to `false`.
-        * - `mediaplayer` (string): The location of the included
-        *    `mediaplayer.swf` file. This allows for the playback of Flash Video
-        *    (`.flv`) files, and is the default handler for non-Odeo MP3's.
-        *    Defaults to blank.
-        * - `video` (string): This is an image that should be used as a
-        *    placeholder for video files before they're loaded (QuickTime-only).
-        *    Can be any relative or absolute URL. Defaults to blank.
-        * - `width` (integer): The width of the embedded media. Accepts any
-        *    numeric pixel value (such as `480`) or `auto`. Defaults to `auto`,
-        *    and it is recommended that you use this default.
-        * - `widescreen` (boolean): Is the enclosure widescreen or standard?
-        *    This applies only to video enclosures, and will automatically resize
-        *    the content appropriately.  Defaults to `false`, implying 4:3 mode.
-        *
-        * Note: Non-widescreen (4:3) mode with `width` and `height` set to `auto`
-        * will default to 480x360 video resolution.  Widescreen (16:9) mode with
-        * `width` and `height` set to `auto` will default to 480x270 video resolution.
-        *
-        * @todo If the dimensions for media:content are defined, use them when width/height are set to 'auto'.
-        * @param array|string $options Comma-separated key:value list, or array
-        * @param bool $native Use `<embed>`
-        * @return string HTML string to output
-        */
-       public function embed($options = '', $native = false)
-       {
-               // Set up defaults
-               $audio = '';
-               $video = '';
-               $alt = '';
-               $altclass = '';
-               $loop = 'false';
-               $width = 'auto';
-               $height = 'auto';
-               $bgcolor = '#ffffff';
-               $mediaplayer = '';
-               $widescreen = false;
-               $handler = $this->get_handler();
-               $type = $this->get_real_type();
-
-               // Process options and reassign values as necessary
-               if (is_array($options))
-               {
-                       extract($options);
-               }
-               else
-               {
-                       $options = explode(',', $options);
-                       foreach($options as $option)
-                       {
-                               $opt = explode(':', $option, 2);
-                               if (isset($opt[0], $opt[1]))
-                               {
-                                       $opt[0] = trim($opt[0]);
-                                       $opt[1] = trim($opt[1]);
-                                       switch ($opt[0])
-                                       {
-                                               case 'audio':
-                                                       $audio = $opt[1];
-                                                       break;
-
-                                               case 'video':
-                                                       $video = $opt[1];
-                                                       break;
-
-                                               case 'alt':
-                                                       $alt = $opt[1];
-                                                       break;
-
-                                               case 'altclass':
-                                                       $altclass = $opt[1];
-                                                       break;
-
-                                               case 'loop':
-                                                       $loop = $opt[1];
-                                                       break;
-
-                                               case 'width':
-                                                       $width = $opt[1];
-                                                       break;
-
-                                               case 'height':
-                                                       $height = $opt[1];
-                                                       break;
-
-                                               case 'bgcolor':
-                                                       $bgcolor = $opt[1];
-                                                       break;
-
-                                               case 'mediaplayer':
-                                                       $mediaplayer = $opt[1];
-                                                       break;
-
-                                               case 'widescreen':
-                                                       $widescreen = $opt[1];
-                                                       break;
-                                       }
-                               }
-                       }
-               }
-
-               $mime = explode('/', $type, 2);
-               $mime = $mime[0];
-
-               // Process values for 'auto'
-               if ($width === 'auto')
-               {
-                       if ($mime === 'video')
-                       {
-                               if ($height === 'auto')
-                               {
-                                       $width = 480;
-                               }
-                               elseif ($widescreen)
-                               {
-                                       $width = round((intval($height)/9)*16);
-                               }
-                               else
-                               {
-                                       $width = round((intval($height)/3)*4);
-                               }
-                       }
-                       else
-                       {
-                               $width = '100%';
-                       }
-               }
-
-               if ($height === 'auto')
-               {
-                       if ($mime === 'audio')
-                       {
-                               $height = 0;
-                       }
-                       elseif ($mime === 'video')
-                       {
-                               if ($width === 'auto')
-                               {
-                                       if ($widescreen)
-                                       {
-                                               $height = 270;
-                                       }
-                                       else
-                                       {
-                                               $height = 360;
-                                       }
-                               }
-                               elseif ($widescreen)
-                               {
-                                       $height = round((intval($width)/16)*9);
-                               }
-                               else
-                               {
-                                       $height = round((intval($width)/4)*3);
-                               }
-                       }
-                       else
-                       {
-                               $height = 376;
-                       }
-               }
-               elseif ($mime === 'audio')
-               {
-                       $height = 0;
-               }
-
-               // Set proper placeholder value
-               if ($mime === 'audio')
-               {
-                       $placeholder = $audio;
-               }
-               elseif ($mime === 'video')
-               {
-                       $placeholder = $video;
-               }
-
-               $embed = '';
-
-               // Flash
-               if ($handler === 'flash')
-               {
-                       if ($native)
-                       {
-                               $embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
-                       }
-                       else
-                       {
-                               $embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
-                       }
-               }
-
-               // Flash Media Player file types.
-               // Preferred handler for MP3 file types.
-               elseif ($handler === 'fmedia' || ($handler === 'mp3' && $mediaplayer !== ''))
-               {
-                       $height += 20;
-                       if ($native)
-                       {
-                               $embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
-                       }
-                       else
-                       {
-                               $embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
-                       }
-               }
-
-               // QuickTime 7 file types.  Need to test with QuickTime 6.
-               // Only handle MP3's if the Flash Media Player is not present.
-               elseif ($handler === 'quicktime' || ($handler === 'mp3' && $mediaplayer === ''))
-               {
-                       $height += 16;
-                       if ($native)
-                       {
-                               if ($placeholder !== '')
-                               {
-                                       $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
-                               }
-                               else
-                               {
-                                       $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
-                               }
-                       }
-                       else
-                       {
-                               $embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
-                       }
-               }
-
-               // Windows Media
-               elseif ($handler === 'wmedia')
-               {
-                       $height += 45;
-                       if ($native)
-                       {
-                               $embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
-                       }
-                       else
-                       {
-                               $embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
-                       }
-               }
-
-               // Everything else
-               else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
-
-               return $embed;
-       }
-
-       /**
-        * Get the real media type
-        *
-        * Often, feeds lie to us, necessitating a bit of deeper inspection. This
-        * converts types to their canonical representations based on the file
-        * extension
-        *
-        * @see get_type()
-        * @param bool $find_handler Internal use only, use {@see get_handler()} instead
-        * @return string MIME type
-        */
-       public function get_real_type($find_handler = false)
-       {
-               // Mime-types by handler.
-               $types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
-               $types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
-               $types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
-               $types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
-               $types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
-
-               if ($this->get_type() !== null)
-               {
-                       $type = strtolower($this->type);
-               }
-               else
-               {
-                       $type = null;
-               }
-
-               // If we encounter an unsupported mime-type, check the file extension and guess intelligently.
-               if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
-               {
-                       $extension = $this->get_extension();
-                       if ($extension === null) {
-                               return null;
-                       }
-
-                       switch (strtolower($extension))
-                       {
-                               // Audio mime-types
-                               case 'aac':
-                               case 'adts':
-                                       $type = 'audio/acc';
-                                       break;
-
-                               case 'aif':
-                               case 'aifc':
-                               case 'aiff':
-                               case 'cdda':
-                                       $type = 'audio/aiff';
-                                       break;
-
-                               case 'bwf':
-                                       $type = 'audio/wav';
-                                       break;
-
-                               case 'kar':
-                               case 'mid':
-                               case 'midi':
-                               case 'smf':
-                                       $type = 'audio/midi';
-                                       break;
-
-                               case 'm4a':
-                                       $type = 'audio/x-m4a';
-                                       break;
-
-                               case 'mp3':
-                               case 'swa':
-                                       $type = 'audio/mp3';
-                                       break;
-
-                               case 'wav':
-                                       $type = 'audio/wav';
-                                       break;
-
-                               case 'wax':
-                                       $type = 'audio/x-ms-wax';
-                                       break;
-
-                               case 'wma':
-                                       $type = 'audio/x-ms-wma';
-                                       break;
-
-                               // Video mime-types
-                               case '3gp':
-                               case '3gpp':
-                                       $type = 'video/3gpp';
-                                       break;
-
-                               case '3g2':
-                               case '3gp2':
-                                       $type = 'video/3gpp2';
-                                       break;
-
-                               case 'asf':
-                                       $type = 'video/x-ms-asf';
-                                       break;
-
-                               case 'flv':
-                                       $type = 'video/x-flv';
-                                       break;
-
-                               case 'm1a':
-                               case 'm1s':
-                               case 'm1v':
-                               case 'm15':
-                               case 'm75':
-                               case 'mp2':
-                               case 'mpa':
-                               case 'mpeg':
-                               case 'mpg':
-                               case 'mpm':
-                               case 'mpv':
-                                       $type = 'video/mpeg';
-                                       break;
-
-                               case 'm4v':
-                                       $type = 'video/x-m4v';
-                                       break;
-
-                               case 'mov':
-                               case 'qt':
-                                       $type = 'video/quicktime';
-                                       break;
-
-                               case 'mp4':
-                               case 'mpg4':
-                                       $type = 'video/mp4';
-                                       break;
-
-                               case 'sdv':
-                                       $type = 'video/sd-video';
-                                       break;
-
-                               case 'wm':
-                                       $type = 'video/x-ms-wm';
-                                       break;
-
-                               case 'wmv':
-                                       $type = 'video/x-ms-wmv';
-                                       break;
-
-                               case 'wvx':
-                                       $type = 'video/x-ms-wvx';
-                                       break;
-
-                               // Flash mime-types
-                               case 'spl':
-                                       $type = 'application/futuresplash';
-                                       break;
-
-                               case 'swf':
-                                       $type = 'application/x-shockwave-flash';
-                                       break;
-                       }
-               }
-
-               if ($find_handler)
-               {
-                       if (in_array($type, $types_flash))
-                       {
-                               return 'flash';
-                       }
-                       elseif (in_array($type, $types_fmedia))
-                       {
-                               return 'fmedia';
-                       }
-                       elseif (in_array($type, $types_quicktime))
-                       {
-                               return 'quicktime';
-                       }
-                       elseif (in_array($type, $types_wmedia))
-                       {
-                               return 'wmedia';
-                       }
-                       elseif (in_array($type, $types_mp3))
-                       {
-                               return 'mp3';
-                       }
-
-                       return null;
-               }
-
-               return $type;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieExceptionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Exception.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Exception.php     2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Exception.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,51 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * General SimplePie exception class
- *
- * @package SimplePie
- */
-class SimplePie_Exception extends Exception
-{
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesSimplePieFilephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/File.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/File.php  2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/File.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,301 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Used for fetching remote files and reading local files
- *
- * Supports HTTP 1.0 via cURL or fsockopen, with spotty HTTP 1.1 support
- *
- * This class can be overloaded with {@see SimplePie::set_file_class()}
- *
- * @package SimplePie
- * @subpackage HTTP
- * @todo Move to properly supporting RFC2616 (HTTP/1.1)
- */
-class SimplePie_File
-{
-       var $url;
-       var $useragent;
-       var $success = true;
-       var $headers = array();
-       var $body;
-       var $status_code;
-       var $redirects = 0;
-       var $error;
-       var $method = SIMPLEPIE_FILE_SOURCE_NONE;
-       var $permanent_url;
-
-       public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false, $curl_options = array())
-       {
-               if (class_exists('idna_convert'))
-               {
-                       $idn = new idna_convert();
-                       $parsed = SimplePie_Misc::parse_url($url);
-                       $url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], NULL);
-               }
-               $this->url = $url;
-               $this->permanent_url = $url;
-               $this->useragent = $useragent;
-               if (preg_match('/^http(s)?:\/\//i', $url))
-               {
-                       if ($useragent === null)
-                       {
-                               $useragent = ini_get('user_agent');
-                               $this->useragent = $useragent;
-                       }
-                       if (!is_array($headers))
-                       {
-                               $headers = array();
-                       }
-                       if (!$force_fsockopen && function_exists('curl_exec'))
-                       {
-                               $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL;
-                               $fp = curl_init();
-                               $headers2 = array();
-                               foreach ($headers as $key => $value)
-                               {
-                                       $headers2[] = "$key: $value";
-                               }
-                               if (version_compare(SimplePie_Misc::get_curl_version(), '7.10.5', '>='))
-                               {
-                                       curl_setopt($fp, CURLOPT_ENCODING, '');
-                               }
-                               curl_setopt($fp, CURLOPT_URL, $url);
-                               curl_setopt($fp, CURLOPT_HEADER, 1);
-                               curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
-                               curl_setopt($fp, CURLOPT_FAILONERROR, 1);
-                               curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);
-                               curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout);
-                               curl_setopt($fp, CURLOPT_REFERER, SimplePie_Misc::url_remove_credentials($url));
-                               curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
-                               curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
-                               foreach ($curl_options as $curl_param => $curl_value) {
-                                       curl_setopt($fp, $curl_param, $curl_value);
-                               }
-
-                               $this->headers = curl_exec($fp);
-                               if (curl_errno($fp) === 23 || curl_errno($fp) === 61)
-                               {
-                                       curl_setopt($fp, CURLOPT_ENCODING, 'none');
-                                       $this->headers = curl_exec($fp);
-                               }
-                               $this->status_code = curl_getinfo($fp, CURLINFO_HTTP_CODE);
-                               if (curl_errno($fp))
-                               {
-                                       $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
-                                       $this->success = false;
-                               }
-                               else
-                               {
-                                       // Use the updated url provided by curl_getinfo after any redirects.
-                                       if ($info = curl_getinfo($fp)) {
-                                               $this->url = $info['url'];
-                                       }
-                                       curl_close($fp);
-                                       $this->headers = SimplePie_HTTP_Parser::prepareHeaders($this->headers, $info['redirect_count'] + 1);
-                                       $parser = new SimplePie_HTTP_Parser($this->headers);
-                                       if ($parser->parse())
-                                       {
-                                               $this->headers = $parser->headers;
-                                               $this->body = trim($parser->body);
-                                               $this->status_code = $parser->status_code;
-                                               if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
-                                               {
-                                                       $this->redirects++;
-                                                       $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
-                                                       $previousStatusCode = $this->status_code;
-                                                       $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen, $curl_options);
-                                                       $this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
-                                                       return;
-                                               }
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
-                               $url_parts = parse_url($url);
-                               $socket_host = $url_parts['host'];
-                               if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
-                               {
-                                       $socket_host = "ssl://$url_parts[host]";
-                                       $url_parts['port'] = 443;
-                               }
-                               if (!isset($url_parts['port']))
-                               {
-                                       $url_parts['port'] = 80;
-                               }
-                               $fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
-                               if (!$fp)
-                               {
-                                       $this->error = 'fsockopen error: ' . $errstr;
-                                       $this->success = false;
-                               }
-                               else
-                               {
-                                       stream_set_timeout($fp, $timeout);
-                                       if (isset($url_parts['path']))
-                                       {
-                                               if (isset($url_parts['query']))
-                                               {
-                                                       $get = "$url_parts[path]?$url_parts[query]";
-                                               }
-                                               else
-                                               {
-                                                       $get = $url_parts['path'];
-                                               }
-                                       }
-                                       else
-                                       {
-                                               $get = '/';
-                                       }
-                                       $out = "GET $get HTTP/1.1\r\n";
-                                       $out .= "Host: $url_parts[host]\r\n";
-                                       $out .= "User-Agent: $useragent\r\n";
-                                       if (extension_loaded('zlib'))
-                                       {
-                                               $out .= "Accept-Encoding: x-gzip,gzip,deflate\r\n";
-                                       }
-
-                                       if (isset($url_parts['user']) && isset($url_parts['pass']))
-                                       {
-                                               $out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
-                                       }
-                                       foreach ($headers as $key => $value)
-                                       {
-                                               $out .= "$key: $value\r\n";
-                                       }
-                                       $out .= "Connection: Close\r\n\r\n";
-                                       fwrite($fp, $out);
-
-                                       $info = stream_get_meta_data($fp);
-
-                                       $this->headers = '';
-                                       while (!$info['eof'] && !$info['timed_out'])
-                                       {
-                                               $this->headers .= fread($fp, 1160);
-                                               $info = stream_get_meta_data($fp);
-                                       }
-                                       if (!$info['timed_out'])
-                                       {
-                                               $parser = new SimplePie_HTTP_Parser($this->headers);
-                                               if ($parser->parse())
-                                               {
-                                                       $this->headers = $parser->headers;
-                                                       $this->body = $parser->body;
-                                                       $this->status_code = $parser->status_code;
-                                                       if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
-                                                       {
-                                                               $this->redirects++;
-                                                               $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
-                                                               $previousStatusCode = $this->status_code;
-                                                               $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen, $curl_options);
-                                                               $this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
-                                                               return;
-                                                       }
-                                                       if (isset($this->headers['content-encoding']))
-                                                       {
-                                                               // Hey, we act dumb elsewhere, so let's do that here too
-                                                               switch (strtolower(trim($this->headers['content-encoding'], "\x09\x0A\x0D\x20")))
-                                                               {
-                                                                       case 'gzip':
-                                                                       case 'x-gzip':
-                                                                               $decoder = new SimplePie_gzdecode($this->body);
-                                                                               if (!$decoder->parse())
-                                                                               {
-                                                                                       $this->error = 'Unable to decode HTTP "gzip" stream';
-                                                                                       $this->success = false;
-                                                                               }
-                                                                               else
-                                                                               {
-                                                                                       $this->body = trim($decoder->data);
-                                                                               }
-                                                                               break;
-
-                                                                       case 'deflate':
-                                                                               if (($decompressed = gzinflate($this->body)) !== false)
-                                                                               {
-                                                                                       $this->body = $decompressed;
-                                                                               }
-                                                                               else if (($decompressed = gzuncompress($this->body)) !== false)
-                                                                               {
-                                                                                       $this->body = $decompressed;
-                                                                               }
-                                                                               else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
-                                                                               {
-                                                                                       $this->body = $decompressed;
-                                                                               }
-                                                                               else
-                                                                               {
-                                                                                       $this->error = 'Unable to decode HTTP "deflate" stream';
-                                                                                       $this->success = false;
-                                                                               }
-                                                                               break;
-
-                                                                       default:
-                                                                               $this->error = 'Unknown content coding';
-                                                                               $this->success = false;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               $this->error = 'fsocket timed out';
-                                               $this->success = false;
-                                       }
-                                       fclose($fp);
-                               }
-                       }
-               }
-               else
-               {
-                       $this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
-                       if (empty($url) || !($this->body = trim(file_get_contents($url))))
-                       {
-                               $this->error = 'file_get_contents could not read the file';
-                               $this->success = false;
-                       }
-               }
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieIRIphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/IRI.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/IRI.php   2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/IRI.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,1236 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * IRI parser/serialiser/normaliser
- *
- * @package SimplePie
- * @subpackage HTTP
- * @author Sam Sneddon
- * @author Steve Minutillo
- * @author Ryan McCue
- * @copyright 2007-2012 Sam Sneddon, Steve Minutillo, Ryan McCue
- * @license http://www.opensource.org/licenses/bsd-license.php
- */
-class SimplePie_IRI
-{
-       /**
-        * Scheme
-        *
-        * @var string
-        */
-       protected $scheme = null;
-
-       /**
-        * User Information
-        *
-        * @var string
-        */
-       protected $iuserinfo = null;
-
-       /**
-        * ihost
-        *
-        * @var string
-        */
-       protected $ihost = null;
-
-       /**
-        * Port
-        *
-        * @var string
-        */
-       protected $port = null;
-
-       /**
-        * ipath
-        *
-        * @var string
-        */
-       protected $ipath = '';
-
-       /**
-        * iquery
-        *
-        * @var string
-        */
-       protected $iquery = null;
-
-       /**
-        * ifragment
-        *
-        * @var string
-        */
-       protected $ifragment = null;
-
-       /**
-        * Normalization database
-        *
-        * Each key is the scheme, each value is an array with each key as the IRI
-        * part and value as the default value for that part.
-        */
-       protected $normalization = array(
-               'acap' => array(
-                       'port' => 674
-               ),
-               'dict' => array(
-                       'port' => 2628
-               ),
-               'file' => array(
-                       'ihost' => 'localhost'
-               ),
-               'http' => array(
-                       'port' => 80,
-                       'ipath' => '/'
-               ),
-               'https' => array(
-                       'port' => 443,
-                       'ipath' => '/'
-               ),
-       );
-
-       /**
-        * Return the entire IRI when you try and read the object as a string
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               return $this->get_iri();
-       }
-
-       /**
-        * Overload __set() to provide access via properties
-        *
-        * @param string $name Property name
-        * @param mixed $value Property value
-        */
-       public function __set($name, $value)
-       {
-               if (method_exists($this, 'set_' . $name))
-               {
-                       call_user_func(array($this, 'set_' . $name), $value);
-               }
-               elseif (
-                          $name === 'iauthority'
-                       || $name === 'iuserinfo'
-                       || $name === 'ihost'
-                       || $name === 'ipath'
-                       || $name === 'iquery'
-                       || $name === 'ifragment'
-               )
-               {
-                       call_user_func(array($this, 'set_' . substr($name, 1)), $value);
-               }
-       }
-
-       /**
-        * Overload __get() to provide access via properties
-        *
-        * @param string $name Property name
-        * @return mixed
-        */
-       public function __get($name)
-       {
-               // isset() returns false for null, we don't want to do that
-               // Also why we use array_key_exists below instead of isset()
-               $props = get_object_vars($this);
-
-               if (
-                       $name === 'iri' ||
-                       $name === 'uri' ||
-                       $name === 'iauthority' ||
-                       $name === 'authority'
-               )
-               {
-                       $return = $this->{"get_$name"}();
-               }
-               elseif (array_key_exists($name, $props))
-               {
-                       $return = $this->$name;
-               }
-               // host -> ihost
-               elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
-               {
-                       $name = $prop;
-                       $return = $this->$prop;
-               }
-               // ischeme -> scheme
-               elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props))
-               {
-                       $name = $prop;
-                       $return = $this->$prop;
-               }
-               else
-               {
-                       trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
-                       $return = null;
-               }
-
-               if ($return === null && isset($this->normalization[$this->scheme][$name]))
-               {
-                       return $this->normalization[$this->scheme][$name];
-               }
-
-               return $return;
-       }
-
-       /**
-        * Overload __isset() to provide access via properties
-        *
-        * @param string $name Property name
-        * @return bool
-        */
-       public function __isset($name)
-       {
-               return method_exists($this, 'get_' . $name) || isset($this->$name);
-       }
-
-       /**
-        * Overload __unset() to provide access via properties
-        *
-        * @param string $name Property name
-        */
-       public function __unset($name)
-       {
-               if (method_exists($this, 'set_' . $name))
-               {
-                       call_user_func(array($this, 'set_' . $name), '');
-               }
-       }
-
-       /**
-        * Create a new IRI object, from a specified string
-        *
-        * @param string $iri
-        */
-       public function __construct($iri = null)
-       {
-               $this->set_iri($iri);
-       }
-
-       /**
-        * Clean up
-        */
-       public function __destruct() {
-           $this->set_iri(null, true);
-           $this->set_path(null, true);
-           $this->set_authority(null, true);
-       }
-
-       /**
-        * Create a new IRI object by resolving a relative IRI
-        *
-        * Returns false if $base is not absolute, otherwise an IRI.
-        *
-        * @param IRI|string $base (Absolute) Base IRI
-        * @param IRI|string $relative Relative IRI
-        * @return IRI|false
-        */
-       public static function absolutize($base, $relative)
-       {
-               if (!($relative instanceof SimplePie_IRI))
-               {
-                       $relative = new SimplePie_IRI($relative);
-               }
-               if (!$relative->is_valid())
-               {
-                       return false;
-               }
-               elseif ($relative->scheme !== null)
-               {
-                       return clone $relative;
-               }
-               else
-               {
-                       if (!($base instanceof SimplePie_IRI))
-                       {
-                               $base = new SimplePie_IRI($base);
-                       }
-                       if ($base->scheme !== null && $base->is_valid())
-                       {
-                               if ($relative->get_iri() !== '')
-                               {
-                                       if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null)
-                                       {
-                                               $target = clone $relative;
-                                               $target->scheme = $base->scheme;
-                                       }
-                                       else
-                                       {
-                                               $target = new SimplePie_IRI;
-                                               $target->scheme = $base->scheme;
-                                               $target->iuserinfo = $base->iuserinfo;
-                                               $target->ihost = $base->ihost;
-                                               $target->port = $base->port;
-                                               if ($relative->ipath !== '')
-                                               {
-                                                       if ($relative->ipath[0] === '/')
-                                                       {
-                                                               $target->ipath = $relative->ipath;
-                                                       }
-                                                       elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
-                                                       {
-                                                               $target->ipath = '/' . $relative->ipath;
-                                                       }
-                                                       elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
-                                                       {
-                                                               $target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-                                                       }
-                                                       else
-                                                       {
-                                                               $target->ipath = $relative->ipath;
-                                                       }
-                                                       $target->ipath = $target->remove_dot_segments($target->ipath);
-                                                       $target->iquery = $relative->iquery;
-                                               }
-                                               else
-                                               {
-                                                       $target->ipath = $base->ipath;
-                                                       if ($relative->iquery !== null)
-                                                       {
-                                                               $target->iquery = $relative->iquery;
-                                                       }
-                                                       elseif ($base->iquery !== null)
-                                                       {
-                                                               $target->iquery = $base->iquery;
-                                                       }
-                                               }
-                                               $target->ifragment = $relative->ifragment;
-                                       }
-                               }
-                               else
-                               {
-                                       $target = clone $base;
-                                       $target->ifragment = null;
-                               }
-                               $target->scheme_normalization();
-                               return $target;
-                       }
-
-                       return false;
-               }
-       }
-
-       /**
-        * Parse an IRI into scheme/authority/path/query/fragment segments
-        *
-        * @param string $iri
-        * @return array
-        */
-       protected function parse_iri($iri)
-       {
-               $iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
-               if (preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match))
-               {
-                       if ($match[1] === '')
-                       {
-                               $match['scheme'] = null;
-                       }
-                       if (!isset($match[3]) || $match[3] === '')
-                       {
-                               $match['authority'] = null;
-                       }
-                       if (!isset($match[5]))
-                       {
-                               $match['path'] = '';
-                       }
-                       if (!isset($match[6]) || $match[6] === '')
-                       {
-                               $match['query'] = null;
-                       }
-                       if (!isset($match[8]) || $match[8] === '')
-                       {
-                               $match['fragment'] = null;
-                       }
-                       return $match;
-               }
-
-               // This can occur when a paragraph is accidentally parsed as a URI
-               return false;
-       }
-
-       /**
-        * Remove dot segments from a path
-        *
-        * @param string $input
-        * @return string
-        */
-       protected function remove_dot_segments($input)
-       {
-               $output = '';
-               while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..')
-               {
-                       // A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise,
-                       if (strpos($input, '../') === 0)
-                       {
-                               $input = substr($input, 3);
-                       }
-                       elseif (strpos($input, './') === 0)
-                       {
-                               $input = substr($input, 2);
-                       }
-                       // B: if the input buffer begins with a prefix of "/./" or "/.", where "." is a complete path segment, then replace that prefix with "/" in the input buffer; otherwise,
-                       elseif (strpos($input, '/./') === 0)
-                       {
-                               $input = substr($input, 2);
-                       }
-                       elseif ($input === '/.')
-                       {
-                               $input = '/';
-                       }
-                       // C: if the input buffer begins with a prefix of "/../" or "/..", where ".." is a complete path segment, then replace that prefix with "/" in the input buffer and remove the last segment and its preceding "/" (if any) from the output buffer; otherwise,
-                       elseif (strpos($input, '/../') === 0)
-                       {
-                               $input = substr($input, 3);
-                               $output = substr_replace($output, '', strrpos($output, '/'));
-                       }
-                       elseif ($input === '/..')
-                       {
-                               $input = '/';
-                               $output = substr_replace($output, '', strrpos($output, '/'));
-                       }
-                       // D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise,
-                       elseif ($input === '.' || $input === '..')
-                       {
-                               $input = '';
-                       }
-                       // E: move the first path segment in the input buffer to the end of the output buffer, including the initial "/" character (if any) and any subsequent characters up to, but not including, the next "/" character or the end of the input buffer
-                       elseif (($pos = strpos($input, '/', 1)) !== false)
-                       {
-                               $output .= substr($input, 0, $pos);
-                               $input = substr_replace($input, '', 0, $pos);
-                       }
-                       else
-                       {
-                               $output .= $input;
-                               $input = '';
-                       }
-               }
-               return $output . $input;
-       }
-
-       /**
-        * Replace invalid character with percent encoding
-        *
-        * @param string $string Input string
-        * @param string $extra_chars Valid characters not in iunreserved or
-        *                            iprivate (this is ASCII-only)
-        * @param bool $iprivate Allow iprivate
-        * @return string
-        */
-       protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
-       {
-               // Normalize as many pct-encoded sections as possible
-               $string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array($this, 'remove_iunreserved_percent_encoded'), $string);
-
-               // Replace invalid percent characters
-               $string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
-
-               // Add unreserved and % to $extra_chars (the latter is safe because all
-               // pct-encoded sections are now valid).
-               $extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
-
-               // Now replace any bytes that aren't allowed with their pct-encoded versions
-               $position = 0;
-               $strlen = strlen($string);
-               while (($position += strspn($string, $extra_chars, $position)) < $strlen)
-               {
-                       $value = ord($string[$position]);
-
-                       // Start position
-                       $start = $position;
-
-                       // By default we are valid
-                       $valid = true;
-
-                       // No one byte sequences are valid due to the while.
-                       // Two byte sequence:
-                       if (($value & 0xE0) === 0xC0)
-                       {
-                               $character = ($value & 0x1F) << 6;
-                               $length = 2;
-                               $remaining = 1;
-                       }
-                       // Three byte sequence:
-                       elseif (($value & 0xF0) === 0xE0)
-                       {
-                               $character = ($value & 0x0F) << 12;
-                               $length = 3;
-                               $remaining = 2;
-                       }
-                       // Four byte sequence:
-                       elseif (($value & 0xF8) === 0xF0)
-                       {
-                               $character = ($value & 0x07) << 18;
-                               $length = 4;
-                               $remaining = 3;
-                       }
-                       // Invalid byte:
-                       else
-                       {
-                               $valid = false;
-                               $length = 1;
-                               $remaining = 0;
-                       }
-
-                       if ($remaining)
-                       {
-                               if ($position + $length <= $strlen)
-                               {
-                                       for ($position++; $remaining; $position++)
-                                       {
-                                               $value = ord($string[$position]);
-
-                                               // Check that the byte is valid, then add it to the character:
-                                               if (($value & 0xC0) === 0x80)
-                                               {
-                                                       $character |= ($value & 0x3F) << (--$remaining * 6);
-                                               }
-                                               // If it is invalid, count the sequence as invalid and reprocess the current byte:
-                                               else
-                                               {
-                                                       $valid = false;
-                                                       $position--;
-                                                       break;
-                                               }
-                                       }
-                               }
-                               else
-                               {
-                                       $position = $strlen - 1;
-                                       $valid = false;
-                               }
-                       }
-
-                       // Percent encode anything invalid or not in ucschar
-                       if (
-                               // Invalid sequences
-                               !$valid
-                               // Non-shortest form sequences are invalid
-                               || $length > 1 && $character <= 0x7F
-                               || $length > 2 && $character <= 0x7FF
-                               || $length > 3 && $character <= 0xFFFF
-                               // Outside of range of ucschar codepoints
-                               // Noncharacters
-                               || ($character & 0xFFFE) === 0xFFFE
-                               || $character >= 0xFDD0 && $character <= 0xFDEF
-                               || (
-                                       // Everything else not in ucschar
-                                          $character > 0xD7FF && $character < 0xF900
-                                       || $character < 0xA0
-                                       || $character > 0xEFFFD
-                               )
-                               && (
-                                       // Everything not in iprivate, if it applies
-                                          !$iprivate
-                                       || $character < 0xE000
-                                       || $character > 0x10FFFD
-                               )
-                       )
-                       {
-                               // If we were a character, pretend we weren't, but rather an error.
-                               if ($valid)
-                                       $position--;
-
-                               for ($j = $start; $j <= $position; $j++)
-                               {
-                                       $string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
-                                       $j += 2;
-                                       $position += 2;
-                                       $strlen += 2;
-                               }
-                       }
-               }
-
-               return $string;
-       }
-
-       /**
-        * Callback function for preg_replace_callback.
-        *
-        * Removes sequences of percent encoded bytes that represent UTF-8
-        * encoded characters in iunreserved
-        *
-        * @param array $match PCRE match
-        * @return string Replacement
-        */
-       protected function remove_iunreserved_percent_encoded($match)
-       {
-               // As we just have valid percent encoded sequences we can just explode
-               // and ignore the first member of the returned array (an empty string).
-               $bytes = explode('%', $match[0]);
-
-               // Initialize the new string (this is what will be returned) and that
-               // there are no bytes remaining in the current sequence (unsurprising
-               // at the first byte!).
-               $string = '';
-               $remaining = 0;
-
-               // Loop over each and every byte, and set $value to its value
-               for ($i = 1, $len = count($bytes); $i < $len; $i++)
-               {
-                       $value = hexdec($bytes[$i]);
-
-                       // If we're the first byte of sequence:
-                       if (!$remaining)
-                       {
-                               // Start position
-                               $start = $i;
-
-                               // By default we are valid
-                               $valid = true;
-
-                               // One byte sequence:
-                               if ($value <= 0x7F)
-                               {
-                                       $character = $value;
-                                       $length = 1;
-                               }
-                               // Two byte sequence:
-                               elseif (($value & 0xE0) === 0xC0)
-                               {
-                                       $character = ($value & 0x1F) << 6;
-                                       $length = 2;
-                                       $remaining = 1;
-                               }
-                               // Three byte sequence:
-                               elseif (($value & 0xF0) === 0xE0)
-                               {
-                                       $character = ($value & 0x0F) << 12;
-                                       $length = 3;
-                                       $remaining = 2;
-                               }
-                               // Four byte sequence:
-                               elseif (($value & 0xF8) === 0xF0)
-                               {
-                                       $character = ($value & 0x07) << 18;
-                                       $length = 4;
-                                       $remaining = 3;
-                               }
-                               // Invalid byte:
-                               else
-                               {
-                                       $valid = false;
-                                       $remaining = 0;
-                               }
-                       }
-                       // Continuation byte:
-                       else
-                       {
-                               // Check that the byte is valid, then add it to the character:
-                               if (($value & 0xC0) === 0x80)
-                               {
-                                       $remaining--;
-                                       $character |= ($value & 0x3F) << ($remaining * 6);
-                               }
-                               // If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
-                               else
-                               {
-                                       $valid = false;
-                                       $remaining = 0;
-                                       $i--;
-                               }
-                       }
-
-                       // If we've reached the end of the current byte sequence, append it to Unicode::$data
-                       if (!$remaining)
-                       {
-                               // Percent encode anything invalid or not in iunreserved
-                               if (
-                                       // Invalid sequences
-                                       !$valid
-                                       // Non-shortest form sequences are invalid
-                                       || $length > 1 && $character <= 0x7F
-                                       || $length > 2 && $character <= 0x7FF
-                                       || $length > 3 && $character <= 0xFFFF
-                                       // Outside of range of iunreserved codepoints
-                                       || $character < 0x2D
-                                       || $character > 0xEFFFD
-                                       // Noncharacters
-                                       || ($character & 0xFFFE) === 0xFFFE
-                                       || $character >= 0xFDD0 && $character <= 0xFDEF
-                                       // Everything else not in iunreserved (this is all BMP)
-                                       || $character === 0x2F
-                                       || $character > 0x39 && $character < 0x41
-                                       || $character > 0x5A && $character < 0x61
-                                       || $character > 0x7A && $character < 0x7E
-                                       || $character > 0x7E && $character < 0xA0
-                                       || $character > 0xD7FF && $character < 0xF900
-                               )
-                               {
-                                       for ($j = $start; $j <= $i; $j++)
-                                       {
-                                               $string .= '%' . strtoupper($bytes[$j]);
-                                       }
-                               }
-                               else
-                               {
-                                       for ($j = $start; $j <= $i; $j++)
-                                       {
-                                               $string .= chr(hexdec($bytes[$j]));
-                                       }
-                               }
-                       }
-               }
-
-               // If we have any bytes left over they are invalid (i.e., we are
-               // mid-way through a multi-byte sequence)
-               if ($remaining)
-               {
-                       for ($j = $start; $j < $len; $j++)
-                       {
-                               $string .= '%' . strtoupper($bytes[$j]);
-                       }
-               }
-
-               return $string;
-       }
-
-       protected function scheme_normalization()
-       {
-               if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo'])
-               {
-                       $this->iuserinfo = null;
-               }
-               if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost'])
-               {
-                       $this->ihost = null;
-               }
-               if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port'])
-               {
-                       $this->port = null;
-               }
-               if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath'])
-               {
-                       $this->ipath = '';
-               }
-               if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery'])
-               {
-                       $this->iquery = null;
-               }
-               if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment'])
-               {
-                       $this->ifragment = null;
-               }
-       }
-
-       /**
-        * Check if the object represents a valid IRI. This needs to be done on each
-        * call as some things change depending on another part of the IRI.
-        *
-        * @return bool
-        */
-       public function is_valid()
-       {
-               if ($this->ipath === '') return true;
-
-               $isauthority = $this->iuserinfo !== null || $this->ihost !== null ||
-                       $this->port !== null;
-               if ($isauthority && $this->ipath[0] === '/') return true;
-
-               if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) return false;
-
-               // Relative urls cannot have a colon in the first path segment (and the
-               // slashes themselves are not included so skip the first character).
-               if (!$this->scheme && !$isauthority &&
-                   strpos($this->ipath, ':') !== false &&
-                   strpos($this->ipath, '/', 1) !== false &&
-                   strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false;
-
-               return true;
-       }
-
-       /**
-        * Set the entire IRI. Returns true on success, false on failure (if there
-        * are any invalid characters).
-        *
-        * @param string $iri
-        * @return bool
-        */
-       public function set_iri($iri, $clear_cache = false)
-       {
-               static $cache;
-               if ($clear_cache)
-               {
-                       $cache = null;
-                       return;
-               }
-               if (!$cache)
-               {
-                       $cache = array();
-               }
-
-               if ($iri === null)
-               {
-                       return true;
-               }
-               elseif (isset($cache[$iri]))
-               {
-                       list($this->scheme,
-                                $this->iuserinfo,
-                                $this->ihost,
-                                $this->port,
-                                $this->ipath,
-                                $this->iquery,
-                                $this->ifragment,
-                                $return) = $cache[$iri];
-                       return $return;
-               }
-
-               $parsed = $this->parse_iri((string) $iri);
-               if (!$parsed)
-               {
-                       return false;
-               }
-
-               $return = $this->set_scheme($parsed['scheme'])
-                       && $this->set_authority($parsed['authority'])
-                       && $this->set_path($parsed['path'])
-                       && $this->set_query($parsed['query'])
-                       && $this->set_fragment($parsed['fragment']);
-
-               $cache[$iri] = array($this->scheme,
-                                                        $this->iuserinfo,
-                                                        $this->ihost,
-                                                        $this->port,
-                                                        $this->ipath,
-                                                        $this->iquery,
-                                                        $this->ifragment,
-                                                        $return);
-               return $return;
-       }
-
-       /**
-        * Set the scheme. Returns true on success, false on failure (if there are
-        * any invalid characters).
-        *
-        * @param string $scheme
-        * @return bool
-        */
-       public function set_scheme($scheme)
-       {
-               if ($scheme === null)
-               {
-                       $this->scheme = null;
-               }
-               elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
-               {
-                       $this->scheme = null;
-                       return false;
-               }
-               else
-               {
-                       $this->scheme = strtolower($scheme);
-               }
-               return true;
-       }
-
-       /**
-        * Set the authority. Returns true on success, false on failure (if there are
-        * any invalid characters).
-        *
-        * @param string $authority
-        * @return bool
-        */
-       public function set_authority($authority, $clear_cache = false)
-       {
-               static $cache;
-               if ($clear_cache)
-               {
-                       $cache = null;
-                       return;
-               }
-               if (!$cache)
-                       $cache = array();
-
-               if ($authority === null)
-               {
-                       $this->iuserinfo = null;
-                       $this->ihost = null;
-                       $this->port = null;
-                       return true;
-               }
-               elseif (isset($cache[$authority]))
-               {
-                       list($this->iuserinfo,
-                                $this->ihost,
-                                $this->port,
-                                $return) = $cache[$authority];
-
-                       return $return;
-               }
-
-               $remaining = $authority;
-               if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
-               {
-                       $iuserinfo = substr($remaining, 0, $iuserinfo_end);
-                       $remaining = substr($remaining, $iuserinfo_end + 1);
-               }
-               else
-               {
-                       $iuserinfo = null;
-               }
-               if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false)
-               {
-                       if (($port = substr($remaining, $port_start + 1)) === false)
-                       {
-                               $port = null;
-                       }
-                       $remaining = substr($remaining, 0, $port_start);
-               }
-               else
-               {
-                       $port = null;
-               }
-
-               $return = $this->set_userinfo($iuserinfo) &&
-                                 $this->set_host($remaining) &&
-                                 $this->set_port($port);
-
-               $cache[$authority] = array($this->iuserinfo,
-                                                                  $this->ihost,
-                                                                  $this->port,
-                                                                  $return);
-
-               return $return;
-       }
-
-       /**
-        * Set the iuserinfo.
-        *
-        * @param string $iuserinfo
-        * @return bool
-        */
-       public function set_userinfo($iuserinfo)
-       {
-               if ($iuserinfo === null)
-               {
-                       $this->iuserinfo = null;
-               }
-               else
-               {
-                       $this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
-                       $this->scheme_normalization();
-               }
-
-               return true;
-       }
-
-       /**
-        * Set the ihost. Returns true on success, false on failure (if there are
-        * any invalid characters).
-        *
-        * @param string $ihost
-        * @return bool
-        */
-       public function set_host($ihost)
-       {
-               if ($ihost === null)
-               {
-                       $this->ihost = null;
-                       return true;
-               }
-               elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
-               {
-                       if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
-                       {
-                               $this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
-                       }
-                       else
-                       {
-                               $this->ihost = null;
-                               return false;
-                       }
-               }
-               else
-               {
-                       $ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
-
-                       // Lowercase, but ignore pct-encoded sections (as they should
-                       // remain uppercase). This must be done after the previous step
-                       // as that can add unescaped characters.
-                       $position = 0;
-                       $strlen = strlen($ihost);
-                       while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen)
-                       {
-                               if ($ihost[$position] === '%')
-                               {
-                                       $position += 3;
-                               }
-                               else
-                               {
-                                       $ihost[$position] = strtolower($ihost[$position]);
-                                       $position++;
-                               }
-                       }
-
-                       $this->ihost = $ihost;
-               }
-
-               $this->scheme_normalization();
-
-               return true;
-       }
-
-       /**
-        * Set the port. Returns true on success, false on failure (if there are
-        * any invalid characters).
-        *
-        * @param string $port
-        * @return bool
-        */
-       public function set_port($port)
-       {
-               if ($port === null)
-               {
-                       $this->port = null;
-                       return true;
-               }
-               elseif (strspn($port, '0123456789') === strlen($port))
-               {
-                       $this->port = (int) $port;
-                       $this->scheme_normalization();
-                       return true;
-               }
-
-               $this->port = null;
-               return false;
-       }
-
-       /**
-        * Set the ipath.
-        *
-        * @param string $ipath
-        * @return bool
-        */
-       public function set_path($ipath, $clear_cache = false)
-       {
-               static $cache;
-               if ($clear_cache)
-               {
-                       $cache = null;
-                       return;
-               }
-               if (!$cache)
-               {
-                       $cache = array();
-               }
-
-               $ipath = (string) $ipath;
-
-               if (isset($cache[$ipath]))
-               {
-                       $this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-               }
-               else
-               {
-                       $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
-                       $removed = $this->remove_dot_segments($valid);
-
-                       $cache[$ipath] = array($valid, $removed);
-                       $this->ipath =  ($this->scheme !== null) ? $removed : $valid;
-               }
-
-               $this->scheme_normalization();
-               return true;
-       }
-
-       /**
-        * Set the iquery.
-        *
-        * @param string $iquery
-        * @return bool
-        */
-       public function set_query($iquery)
-       {
-               if ($iquery === null)
-               {
-                       $this->iquery = null;
-               }
-               else
-               {
-                       $this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
-                       $this->scheme_normalization();
-               }
-               return true;
-       }
-
-       /**
-        * Set the ifragment.
-        *
-        * @param string $ifragment
-        * @return bool
-        */
-       public function set_fragment($ifragment)
-       {
-               if ($ifragment === null)
-               {
-                       $this->ifragment = null;
-               }
-               else
-               {
-                       $this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
-                       $this->scheme_normalization();
-               }
-               return true;
-       }
-
-       /**
-        * Convert an IRI to a URI (or parts thereof)
-        *
-        * @return string
-        */
-       public function to_uri($string)
-       {
-               static $non_ascii;
-               if (!$non_ascii)
-               {
-                       $non_ascii = implode('', range("\x80", "\xFF"));
-               }
-
-               $position = 0;
-               $strlen = strlen($string);
-               while (($position += strcspn($string, $non_ascii, $position)) < $strlen)
-               {
-                       $string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
-                       $position += 3;
-                       $strlen += 2;
-               }
-
-               return $string;
-       }
-
-       /**
-        * Get the complete IRI
-        *
-        * @return string
-        */
-       public function get_iri()
-       {
-               if (!$this->is_valid())
-               {
-                       return false;
-               }
-
-               $iri = '';
-               if ($this->scheme !== null)
-               {
-                       $iri .= $this->scheme . ':';
-               }
-               if (($iauthority = $this->get_iauthority()) !== null)
-               {
-                       $iri .= '//' . $iauthority;
-               }
-               if ($this->ipath !== '')
-               {
-                       $iri .= $this->ipath;
-               }
-        elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
-               {
-                       $iri .= $this->normalization[$this->scheme]['ipath'];
-               }
-               if ($this->iquery !== null)
-               {
-                       $iri .= '?' . $this->iquery;
-               }
-               if ($this->ifragment !== null)
-               {
-                       $iri .= '#' . $this->ifragment;
-               }
-
-               return $iri;
-       }
-
-       /**
-        * Get the complete URI
-        *
-        * @return string
-        */
-       public function get_uri()
-       {
-               return $this->to_uri($this->get_iri());
-       }
-
-       /**
-        * Get the complete iauthority
-        *
-        * @return string
-        */
-       protected function get_iauthority()
-       {
-               if ($this->iuserinfo !== null || $this->ihost !== null || $this->port !== null)
-               {
-                       $iauthority = '';
-                       if ($this->iuserinfo !== null)
-                       {
-                               $iauthority .= $this->iuserinfo . '@';
-                       }
-                       if ($this->ihost !== null)
-                       {
-                               $iauthority .= $this->ihost;
-                       }
-            if ($this->port !== null && $this->port !== 0)
-                       {
-                               $iauthority .= ':' . $this->port;
-                       }
-                       return $iauthority;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the complete authority
-        *
-        * @return string
-        */
-       protected function get_authority()
-       {
-               $iauthority = $this->get_iauthority();
-               if (is_string($iauthority))
-                       return $this->to_uri($iauthority);
-
-               return $iauthority;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieItemphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Item.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Item.php  2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Item.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,2967 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-
-/**
- * Manages all item-related data
- *
- * Used by {@see SimplePie::get_item()} and {@see SimplePie::get_items()}
- *
- * This class can be overloaded with {@see SimplePie::set_item_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Item
-{
-       /**
-        * Parent feed
-        *
-        * @access private
-        * @var SimplePie
-        */
-       var $feed;
-
-       /**
-        * Raw data
-        *
-        * @access private
-        * @var array
-        */
-       var $data = array();
-
-       /**
-        * Registry object
-        *
-        * @see set_registry
-        * @var SimplePie_Registry
-        */
-       protected $registry;
-
-       /**
-        * Create a new item object
-        *
-        * This is usually used by {@see SimplePie::get_items} and
-        * {@see SimplePie::get_item}. Avoid creating this manually.
-        *
-        * @param SimplePie $feed Parent feed
-        * @param array $data Raw data
-        */
-       public function __construct($feed, $data)
-       {
-               $this->feed = $feed;
-               $this->data = $data;
-       }
-
-       /**
-        * Set the registry handler
-        *
-        * This is usually used by {@see SimplePie_Registry::create}
-        *
-        * @since 1.3
-        * @param SimplePie_Registry $registry
-        */
-       public function set_registry(SimplePie_Registry $registry)
-       {
-               $this->registry = $registry;
-       }
-
-       /**
-        * Get a string representation of the item
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               return md5(serialize($this->data));
-       }
-
-       /**
-        * Remove items that link back to this before destroying this object
-        */
-       public function __destruct()
-       {
-               if (!gc_enabled())
-               {
-                       unset($this->feed);
-               }
-       }
-
-       /**
-        * Get data for an item-level element
-        *
-        * This method allows you to get access to ANY element/attribute that is a
-        * sub-element of the item/entry tag.
-        *
-        * See {@see SimplePie::get_feed_tags()} for a description of the return value
-        *
-        * @since 1.0
-        * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
-        * @param string $namespace The URL of the XML namespace of the elements you're trying to access
-        * @param string $tag Tag name
-        * @return array
-        */
-       public function get_item_tags($namespace, $tag)
-       {
-               if (isset($this->data['child'][$namespace][$tag]))
-               {
-                       return $this->data['child'][$namespace][$tag];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the base URL value from the parent feed
-        *
-        * Uses `<xml:base>`
-        *
-        * @param array $element
-        * @return string
-        */
-       public function get_base($element = array())
-       {
-               return $this->feed->get_base($element);
-       }
-
-       /**
-        * Sanitize feed data
-        *
-        * @access private
-        * @see SimplePie::sanitize()
-        * @param string $data Data to sanitize
-        * @param int $type One of the SIMPLEPIE_CONSTRUCT_* constants
-        * @param string $base Base URL to resolve URLs against
-        * @return string Sanitized data
-        */
-       public function sanitize($data, $type, $base = '')
-       {
-               return $this->feed->sanitize($data, $type, $base);
-       }
-
-       /**
-        * Get the parent feed
-        *
-        * Note: this may not work as you think for multifeeds!
-        *
-        * @link http://simplepie.org/faq/typical_multifeed_gotchas#missing_data_from_feed
-        * @since 1.0
-        * @return SimplePie
-        */
-       public function get_feed()
-       {
-               return $this->feed;
-       }
-
-       /**
-        * Get the unique identifier for the item
-        *
-        * This is usually used when writing code to check for new items in a feed.
-        *
-        * Uses `<atom:id>`, `<guid>`, `<dc:identifier>` or the `about` attribute
-        * for RDF. If none of these are supplied (or `$hash` is true), creates an
-        * MD5 hash based on the permalink, title and content.
-        *
-        * @since Beta 2
-        * @param boolean $hash Should we force using a hash instead of the supplied ID?
-        * @param string|false $fn User-supplied function to generate an hash
-        * @return string|null
-        */
-       public function get_id($hash = false, $fn = 'md5')
-       {
-               if (!$hash)
-               {
-                       if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
-                       {
-                               return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
-                       {
-                               return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
-                       {
-                               return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
-                       {
-                               return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
-                       {
-                               return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
-                       {
-                               return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-               }
-               if ($fn === false)
-               {
-                       return null;
-               }
-               elseif (!is_callable($fn))
-               {
-                       trigger_error('User-supplied function $fn must be callable', E_USER_WARNING);
-                       $fn = 'md5';
-               }
-               return call_user_func($fn,
-                      $this->get_permalink().$this->get_title().$this->get_content());
-       }
-
-       /**
-        * Get the title of the item
-        *
-        * Uses `<atom:title>`, `<title>` or `<dc:title>`
-        *
-        * @since Beta 2 (previously called `get_item_title` since 0.8)
-        * @return string|null
-        */
-       public function get_title()
-       {
-               if (!isset($this->data['title']))
-               {
-                       if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
-                       {
-                               $this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
-                       {
-                               $this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
-                       {
-                               $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
-                       {
-                               $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
-                       {
-                               $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
-                       {
-                               $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
-                       {
-                               $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       else
-                       {
-                               $this->data['title'] = null;
-                       }
-               }
-               return $this->data['title'];
-       }
-
-       /**
-        * Get the content for the item
-        *
-        * Prefers summaries over full content , but will return full content if a
-        * summary does not exist.
-        *
-        * To prefer full content instead, use {@see get_content}
-        *
-        * Uses `<atom:summary>`, `<description>`, `<dc:description>` or
-        * `<itunes:subtitle>`
-        *
-        * @since 0.8
-        * @param boolean $description_only Should we avoid falling back to the content?
-        * @return string|null
-        */
-       public function get_description($description_only = false)
-       {
-               if (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary')) &&
-                   ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) &&
-                       ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) &&
-                       ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0]))))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) &&
-                       ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) &&
-                       ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
-                       ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) &&
-                       ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) &&
-                       ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
-                       ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML)))
-               {
-                       return $return;
-               }
-
-               elseif (!$description_only)
-               {
-                       return $this->get_content(true);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the content for the item
-        *
-        * Prefers full content over summaries, but will return a summary if full
-        * content does not exist.
-        *
-        * To prefer summaries instead, use {@see get_description}
-        *
-        * Uses `<atom:content>` or `<content:encoded>` (RSS 1.0 Content Module)
-        *
-        * @since 1.0
-        * @param boolean $content_only Should we avoid falling back to the description?
-        * @return string|null
-        */
-       public function get_content($content_only = false)
-       {
-               if (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content')) &&
-                   ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) &&
-                       ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
-               {
-                       return $return;
-               }
-               elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
-                       ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
-               {
-                       return $return;
-               }
-               elseif (!$content_only)
-               {
-                       return $this->get_description(true);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the media:thumbnail of the item
-        *
-        * Uses `<media:thumbnail>`
-        *
-        *
-        * @return array|null
-        */
-       public function get_thumbnail()
-       {
-               if (!isset($this->data['thumbnail']))
-               {
-                       if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
-                       {
-                               $this->data['thumbnail'] = $return[0]['attribs'][''];
-                       }
-                       else
-                       {
-                               $this->data['thumbnail'] = null;
-                       }
-               }
-               return $this->data['thumbnail'];
-       }
-
-       /**
-        * Get a category for the item
-        *
-        * @since Beta 3 (previously called `get_categories()` since Beta 2)
-        * @param int $key The category that you want to return.  Remember that arrays begin with 0, not 1
-        * @return SimplePie_Category|null
-        */
-       public function get_category($key = 0)
-       {
-               $categories = $this->get_categories();
-               if (isset($categories[$key]))
-               {
-                       return $categories[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all categories for the item
-        *
-        * Uses `<atom:category>`, `<category>` or `<dc:subject>`
-        *
-        * @since Beta 3
-        * @return SimplePie_Category[]|null List of {@see SimplePie_Category} objects
-        */
-       public function get_categories()
-       {
-               $categories = array();
-
-               $type = 'category';
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, $type) as $category)
-               {
-                       $term = null;
-                       $scheme = null;
-                       $label = null;
-                       if (isset($category['attribs']['']['term']))
-                       {
-                               $term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($category['attribs']['']['scheme']))
-                       {
-                               $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($category['attribs']['']['label']))
-                       {
-                               $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       $categories[] = $this->registry->create('Category', array($term, $scheme, $label, $type));
-               }
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, $type) as $category)
-               {
-                       // This is really the label, but keep this as the term also for BC.
-                       // Label will also work on retrieving because that falls back to term.
-                       $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       if (isset($category['attribs']['']['domain']))
-                       {
-                               $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       else
-                       {
-                               $scheme = null;
-                       }
-                       $categories[] = $this->registry->create('Category', array($term, $scheme, null, $type));
-               }
-
-               $type = 'subject';
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, $type) as $category)
-               {
-                       $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null, $type));
-               }
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, $type) as $category)
-               {
-                       $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null, $type));
-               }
-
-               if (!empty($categories))
-               {
-                       return array_unique($categories);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get an author for the item
-        *
-        * @since Beta 2
-        * @param int $key The author that you want to return.  Remember that arrays begin with 0, not 1
-        * @return SimplePie_Author|null
-        */
-       public function get_author($key = 0)
-       {
-               $authors = $this->get_authors();
-               if (isset($authors[$key]))
-               {
-                       return $authors[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a contributor for the item
-        *
-        * @since 1.1
-        * @param int $key The contrbutor that you want to return.  Remember that arrays begin with 0, not 1
-        * @return SimplePie_Author|null
-        */
-       public function get_contributor($key = 0)
-       {
-               $contributors = $this->get_contributors();
-               if (isset($contributors[$key]))
-               {
-                       return $contributors[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all contributors for the item
-        *
-        * Uses `<atom:contributor>`
-        *
-        * @since 1.1
-        * @return SimplePie_Author[]|null List of {@see SimplePie_Author} objects
-        */
-       public function get_contributors()
-       {
-               $contributors = array();
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
-               {
-                       $name = null;
-                       $uri = null;
-                       $email = null;
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
-                       {
-                               $uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $uri !== null)
-                       {
-                               $contributors[] = $this->registry->create('Author', array($name, $uri, $email));
-                       }
-               }
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
-               {
-                       $name = null;
-                       $url = null;
-                       $email = null;
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
-                       {
-                               $url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $url !== null)
-                       {
-                               $contributors[] = $this->registry->create('Author', array($name, $url, $email));
-                       }
-               }
-
-               if (!empty($contributors))
-               {
-                       return array_unique($contributors);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all authors for the item
-        *
-        * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>`
-        *
-        * @since Beta 2
-        * @return SimplePie_Author[]|null List of {@see SimplePie_Author} objects
-        */
-       public function get_authors()
-       {
-               $authors = array();
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
-               {
-                       $name = null;
-                       $uri = null;
-                       $email = null;
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
-                       {
-                               $uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
-                       }
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $uri !== null)
-                       {
-                               $authors[] = $this->registry->create('Author', array($name, $uri, $email));
-                       }
-               }
-               if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
-               {
-                       $name = null;
-                       $url = null;
-                       $email = null;
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
-                       {
-                               $url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
-                       }
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $url !== null)
-                       {
-                               $authors[] = $this->registry->create('Author', array($name, $url, $email));
-                       }
-               }
-               if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'author'))
-               {
-                       $authors[] = $this->registry->create('Author', array(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)));
-               }
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-               foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-
-               if (!empty($authors))
-               {
-                       return array_unique($authors);
-               }
-               elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
-               {
-                       return $authors;
-               }
-               elseif ($authors = $this->feed->get_authors())
-               {
-                       return $authors;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the copyright info for the item
-        *
-        * Uses `<atom:rights>` or `<dc:rights>`
-        *
-        * @since 1.1
-        * @return string
-        */
-       public function get_copyright()
-       {
-               if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the posting date/time for the item
-        *
-        * Uses `<atom:published>`, `<atom:updated>`, `<atom:issued>`,
-        * `<atom:modified>`, `<pubDate>` or `<dc:date>`
-        *
-        * Note: obeys PHP's timezone setting. To get a UTC date/time, use
-        * {@see get_gmdate}
-        *
-        * @since Beta 2 (previously called `get_item_date` since 0.8)
-        *
-        * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data)
-        * @return int|string|null
-        */
-       public function get_date($date_format = 'j F Y, g:i a')
-       {
-               if (!isset($this->data['date']))
-               {
-                       if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
-                       {
-                               $this->data['date']['raw'] = $return[0]['data'];
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
-                       {
-                               $this->data['date']['raw'] = $return[0]['data'];
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
-                       {
-                               $this->data['date']['raw'] = $return[0]['data'];
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
-                       {
-                               $this->data['date']['raw'] = $return[0]['data'];
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
-                       {
-                               $this->data['date']['raw'] = $return[0]['data'];
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
-                       {
-                               $this->data['date']['raw'] = $return[0]['data'];
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
-                       {
-                               $this->data['date']['raw'] = $return[0]['data'];
-                       }
-                       elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
-                       {
-                               $this->data['date']['raw'] = $return[0]['data'];
-                       }
-
-                       if (!empty($this->data['date']['raw']))
-                       {
-                               $parser = $this->registry->call('Parse_Date', 'get');
-                               $this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
-                       }
-                       else
-                       {
-                               $this->data['date'] = null;
-                       }
-               }
-               if ($this->data['date'])
-               {
-                       $date_format = (string) $date_format;
-                       switch ($date_format)
-                       {
-                               case '':
-                                       return $this->sanitize($this->data['date']['raw'], SIMPLEPIE_CONSTRUCT_TEXT);
-
-                               case 'U':
-                                       return $this->data['date']['parsed'];
-
-                               default:
-                                       return date($date_format, $this->data['date']['parsed']);
-                       }
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the update date/time for the item
-        *
-        * Uses `<atom:updated>`
-        *
-        * Note: obeys PHP's timezone setting. To get a UTC date/time, use
-        * {@see get_gmdate}
-        *
-        * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data)
-        * @return int|string|null
-        */
-       public function get_updated_date($date_format = 'j F Y, g:i a')
-       {
-               if (!isset($this->data['updated']))
-               {
-                       if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
-                       {
-                               $this->data['updated']['raw'] = $return[0]['data'];
-                       }
-
-                       if (!empty($this->data['updated']['raw']))
-                       {
-                               $parser = $this->registry->call('Parse_Date', 'get');
-                               $this->data['updated']['parsed'] = $parser->parse($this->data['updated']['raw']);
-                       }
-                       else
-                       {
-                               $this->data['updated'] = null;
-                       }
-               }
-               if ($this->data['updated'])
-               {
-                       $date_format = (string) $date_format;
-                       switch ($date_format)
-                       {
-                               case '':
-                                       return $this->sanitize($this->data['updated']['raw'], SIMPLEPIE_CONSTRUCT_TEXT);
-
-                               case 'U':
-                                       return $this->data['updated']['parsed'];
-
-                               default:
-                                       return date($date_format, $this->data['updated']['parsed']);
-                       }
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the localized posting date/time for the item
-        *
-        * Returns the date formatted in the localized language. To display in
-        * languages other than the server's default, you need to change the locale
-        * with {@link http://php.net/setlocale setlocale()}. The available
-        * localizations depend on which ones are installed on your web server.
-        *
-        * @since 1.0
-        *
-        * @param string $date_format Supports any PHP date format from {@see http://php.net/strftime} (empty for the raw data)
-        * @return int|string|null
-        */
-       public function get_local_date($date_format = '%c')
-       {
-               if (!$date_format)
-               {
-                       return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif (($date = $this->get_date('U')) !== null && $date !== false)
-               {
-                       return strftime($date_format, $date);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the posting date/time for the item (UTC time)
-        *
-        * @see get_date
-        * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
-        * @return int|string|null
-        */
-       public function get_gmdate($date_format = 'j F Y, g:i a')
-       {
-               $date = $this->get_date('U');
-               if ($date === null)
-               {
-                       return null;
-               }
-
-               return gmdate($date_format, $date);
-       }
-
-       /**
-        * Get the update date/time for the item (UTC time)
-        *
-        * @see get_updated_date
-        * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
-        * @return int|string|null
-        */
-       public function get_updated_gmdate($date_format = 'j F Y, g:i a')
-       {
-               $date = $this->get_updated_date('U');
-               if ($date === null)
-               {
-                       return null;
-               }
-
-               return gmdate($date_format, $date);
-       }
-
-       /**
-        * Get the permalink for the item
-        *
-        * Returns the first link available with a relationship of "alternate".
-        * Identical to {@see get_link()} with key 0
-        *
-        * @see get_link
-        * @since 0.8
-        * @return string|null Permalink URL
-        */
-       public function get_permalink()
-       {
-               $link = $this->get_link();
-               $enclosure = $this->get_enclosure(0);
-               if ($link !== null)
-               {
-                       return $link;
-               }
-               elseif ($enclosure !== null)
-               {
-                       return $enclosure->get_link();
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single link for the item
-        *
-        * @since Beta 3
-        * @param int $key The link that you want to return.  Remember that arrays begin with 0, not 1
-        * @param string $rel The relationship of the link to return
-        * @return string|null Link URL
-        */
-       public function get_link($key = 0, $rel = 'alternate')
-       {
-               $links = $this->get_links($rel);
-               if ($links && $links[$key] !== null)
-               {
-                       return $links[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all links for the item
-        *
-        * Uses `<atom:link>`, `<link>` or `<guid>`
-        *
-        * @since Beta 2
-        * @param string $rel The relationship of links to return
-        * @return array|null Links found for the item (strings)
-        */
-       public function get_links($rel = 'alternate')
-       {
-               if (!isset($this->data['links']))
-               {
-                       $this->data['links'] = array();
-                       foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
-                       {
-                               if (isset($link['attribs']['']['href']))
-                               {
-                                       $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-                                       $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-
-                               }
-                       }
-                       foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
-                       {
-                               if (isset($link['attribs']['']['href']))
-                               {
-                                       $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-                                       $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-                               }
-                       }
-                       if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-                       if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-                       if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-                       if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
-                       {
-                               if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true')
-                               {
-                                       $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                               }
-                       }
-
-                       $keys = array_keys($this->data['links']);
-                       foreach ($keys as $key)
-                       {
-                               if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
-                               {
-                                       if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
-                                       {
-                                               $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-                                               $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-                                       }
-                                       else
-                                       {
-                                               $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
-                                       }
-                               }
-                               elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
-                               {
-                                       $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
-                               }
-                               $this->data['links'][$key] = array_unique($this->data['links'][$key]);
-                       }
-               }
-               if (isset($this->data['links'][$rel]))
-               {
-                       return $this->data['links'][$rel];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get an enclosure from the item
-        *
-        * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
-        *
-        * @since Beta 2
-        * @todo Add ability to prefer one type of content over another (in a media group).
-        * @param int $key The enclosure that you want to return.  Remember that arrays begin with 0, not 1
-        * @return SimplePie_Enclosure|null
-        */
-       public function get_enclosure($key = 0, $prefer = null)
-       {
-               $enclosures = $this->get_enclosures();
-               if (isset($enclosures[$key]))
-               {
-                       return $enclosures[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all available enclosures (podcasts, etc.)
-        *
-        * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
-        *
-        * At this point, we're pretty much assuming that all enclosures for an item
-        * are the same content.  Anything else is too complicated to
-        * properly support.
-        *
-        * @since Beta 2
-        * @todo Add support for end-user defined sorting of enclosures by type/handler (so we can prefer the faster-loading FLV over MP4).
-        * @todo If an element exists at a level, but its value is empty, we should fall back to the value from the parent (if it exists).
-        * @return SimplePie_Enclosure[]|null List of SimplePie_Enclosure items
-        */
-       public function get_enclosures()
-       {
-               if (!isset($this->data['enclosures']))
-               {
-                       $this->data['enclosures'] = array();
-
-                       // Elements
-                       $captions_parent = null;
-                       $categories_parent = null;
-                       $copyrights_parent = null;
-                       $credits_parent = null;
-                       $description_parent = null;
-                       $duration_parent = null;
-                       $hashes_parent = null;
-                       $keywords_parent = null;
-                       $player_parent = null;
-                       $ratings_parent = null;
-                       $restrictions_parent = null;
-                       $thumbnails_parent = null;
-                       $title_parent = null;
-
-                       // Let's do the channel and item-level ones first, and just re-use them if we need to.
-                       $parent = $this->get_feed();
-
-                       // CAPTIONS
-                       if ($captions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
-                       {
-                               foreach ($captions as $caption)
-                               {
-                                       $caption_type = null;
-                                       $caption_lang = null;
-                                       $caption_startTime = null;
-                                       $caption_endTime = null;
-                                       $caption_text = null;
-                                       if (isset($caption['attribs']['']['type']))
-                                       {
-                                               $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($caption['attribs']['']['lang']))
-                                       {
-                                               $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($caption['attribs']['']['start']))
-                                       {
-                                               $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($caption['attribs']['']['end']))
-                                       {
-                                               $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($caption['data']))
-                                       {
-                                               $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
-                               }
-                       }
-                       elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
-                       {
-                               foreach ($captions as $caption)
-                               {
-                                       $caption_type = null;
-                                       $caption_lang = null;
-                                       $caption_startTime = null;
-                                       $caption_endTime = null;
-                                       $caption_text = null;
-                                       if (isset($caption['attribs']['']['type']))
-                                       {
-                                               $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($caption['attribs']['']['lang']))
-                                       {
-                                               $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($caption['attribs']['']['start']))
-                                       {
-                                               $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($caption['attribs']['']['end']))
-                                       {
-                                               $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($caption['data']))
-                                       {
-                                               $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
-                               }
-                       }
-                       if (is_array($captions_parent))
-                       {
-                               $captions_parent = array_values(array_unique($captions_parent));
-                       }
-
-                       // CATEGORIES
-                       foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
-                       {
-                               $term = null;
-                               $scheme = null;
-                               $label = null;
-                               if (isset($category['data']))
-                               {
-                                       $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               if (isset($category['attribs']['']['scheme']))
-                               {
-                                       $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               else
-                               {
-                                       $scheme = 'http://search.yahoo.com/mrss/category_schema';
-                               }
-                               if (isset($category['attribs']['']['label']))
-                               {
-                                       $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               $categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
-                       }
-                       foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
-                       {
-                               $term = null;
-                               $scheme = null;
-                               $label = null;
-                               if (isset($category['data']))
-                               {
-                                       $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               if (isset($category['attribs']['']['scheme']))
-                               {
-                                       $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               else
-                               {
-                                       $scheme = 'http://search.yahoo.com/mrss/category_schema';
-                               }
-                               if (isset($category['attribs']['']['label']))
-                               {
-                                       $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               $categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
-                       }
-                       foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category)
-                       {
-                               $term = null;
-                               $scheme = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
-                               $label = null;
-                               if (isset($category['attribs']['']['text']))
-                               {
-                                       $label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               $categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
-
-                               if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category']))
-                               {
-                                       foreach ((array) $category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category'] as $subcategory)
-                                       {
-                                               if (isset($subcategory['attribs']['']['text']))
-                                               {
-                                                       $label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               $categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
-                                       }
-                               }
-                       }
-                       if (is_array($categories_parent))
-                       {
-                               $categories_parent = array_values(array_unique($categories_parent));
-                       }
-
-                       // COPYRIGHT
-                       if ($copyright = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
-                       {
-                               $copyright_url = null;
-                               $copyright_label = null;
-                               if (isset($copyright[0]['attribs']['']['url']))
-                               {
-                                       $copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               if (isset($copyright[0]['data']))
-                               {
-                                       $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               $copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-                       }
-                       elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
-                       {
-                               $copyright_url = null;
-                               $copyright_label = null;
-                               if (isset($copyright[0]['attribs']['']['url']))
-                               {
-                                       $copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               if (isset($copyright[0]['data']))
-                               {
-                                       $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                               $copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-                       }
-
-                       // CREDITS
-                       if ($credits = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
-                       {
-                               foreach ($credits as $credit)
-                               {
-                                       $credit_role = null;
-                                       $credit_scheme = null;
-                                       $credit_name = null;
-                                       if (isset($credit['attribs']['']['role']))
-                                       {
-                                               $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($credit['attribs']['']['scheme']))
-                                       {
-                                               $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       else
-                                       {
-                                               $credit_scheme = 'urn:ebu';
-                                       }
-                                       if (isset($credit['data']))
-                                       {
-                                               $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
-                               }
-                       }
-                       elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
-                       {
-                               foreach ($credits as $credit)
-                               {
-                                       $credit_role = null;
-                                       $credit_scheme = null;
-                                       $credit_name = null;
-                                       if (isset($credit['attribs']['']['role']))
-                                       {
-                                               $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($credit['attribs']['']['scheme']))
-                                       {
-                                               $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       else
-                                       {
-                                               $credit_scheme = 'urn:ebu';
-                                       }
-                                       if (isset($credit['data']))
-                                       {
-                                               $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
-                               }
-                       }
-                       if (is_array($credits_parent))
-                       {
-                               $credits_parent = array_values(array_unique($credits_parent));
-                       }
-
-                       // DESCRIPTION
-                       if ($description_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
-                       {
-                               if (isset($description_parent[0]['data']))
-                               {
-                                       $description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                       }
-                       elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
-                       {
-                               if (isset($description_parent[0]['data']))
-                               {
-                                       $description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                       }
-
-                       // DURATION
-                       if ($duration_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'duration'))
-                       {
-                               $seconds = null;
-                               $minutes = null;
-                               $hours = null;
-                               if (isset($duration_parent[0]['data']))
-                               {
-                                       $temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-                                       if (sizeof($temp) > 0)
-                                       {
-                                               $seconds = (int) array_pop($temp);
-                                       }
-                                       if (sizeof($temp) > 0)
-                                       {
-                                               $minutes = (int) array_pop($temp);
-                                               $seconds += $minutes * 60;
-                                       }
-                                       if (sizeof($temp) > 0)
-                                       {
-                                               $hours = (int) array_pop($temp);
-                                               $seconds += $hours * 3600;
-                                       }
-                                       unset($temp);
-                                       $duration_parent = $seconds;
-                               }
-                       }
-
-                       // HASHES
-                       if ($hashes_iterator = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
-                       {
-                               foreach ($hashes_iterator as $hash)
-                               {
-                                       $value = null;
-                                       $algo = null;
-                                       if (isset($hash['data']))
-                                       {
-                                               $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($hash['attribs']['']['algo']))
-                                       {
-                                               $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       else
-                                       {
-                                               $algo = 'md5';
-                                       }
-                                       $hashes_parent[] = $algo.':'.$value;
-                               }
-                       }
-                       elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
-                       {
-                               foreach ($hashes_iterator as $hash)
-                               {
-                                       $value = null;
-                                       $algo = null;
-                                       if (isset($hash['data']))
-                                       {
-                                               $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($hash['attribs']['']['algo']))
-                                       {
-                                               $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       else
-                                       {
-                                               $algo = 'md5';
-                                       }
-                                       $hashes_parent[] = $algo.':'.$value;
-                               }
-                       }
-                       if (is_array($hashes_parent))
-                       {
-                               $hashes_parent = array_values(array_unique($hashes_parent));
-                       }
-
-                       // KEYWORDS
-                       if ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
-                       {
-                               if (isset($keywords[0]['data']))
-                               {
-                                       $temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-                                       foreach ($temp as $word)
-                                       {
-                                               $keywords_parent[] = trim($word);
-                                       }
-                               }
-                               unset($temp);
-                       }
-                       elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
-                       {
-                               if (isset($keywords[0]['data']))
-                               {
-                                       $temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-                                       foreach ($temp as $word)
-                                       {
-                                               $keywords_parent[] = trim($word);
-                                       }
-                               }
-                               unset($temp);
-                       }
-                       elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
-                       {
-                               if (isset($keywords[0]['data']))
-                               {
-                                       $temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-                                       foreach ($temp as $word)
-                                       {
-                                               $keywords_parent[] = trim($word);
-                                       }
-                               }
-                               unset($temp);
-                       }
-                       elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
-                       {
-                               if (isset($keywords[0]['data']))
-                               {
-                                       $temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-                                       foreach ($temp as $word)
-                                       {
-                                               $keywords_parent[] = trim($word);
-                                       }
-                               }
-                               unset($temp);
-                       }
-                       if (is_array($keywords_parent))
-                       {
-                               $keywords_parent = array_values(array_unique($keywords_parent));
-                       }
-
-                       // PLAYER
-                       if ($player_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
-                       {
-                               if (isset($player_parent[0]['attribs']['']['url']))
-                               {
-                                       $player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                               }
-                       }
-                       elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
-                       {
-                               if (isset($player_parent[0]['attribs']['']['url']))
-                               {
-                                       $player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                               }
-                       }
-
-                       // RATINGS
-                       if ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
-                       {
-                               foreach ($ratings as $rating)
-                               {
-                                       $rating_scheme = null;
-                                       $rating_value = null;
-                                       if (isset($rating['attribs']['']['scheme']))
-                                       {
-                                               $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       else
-                                       {
-                                               $rating_scheme = 'urn:simple';
-                                       }
-                                       if (isset($rating['data']))
-                                       {
-                                               $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
-                               }
-                       }
-                       elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
-                       {
-                               foreach ($ratings as $rating)
-                               {
-                                       $rating_scheme = 'urn:itunes';
-                                       $rating_value = null;
-                                       if (isset($rating['data']))
-                                       {
-                                               $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
-                               }
-                       }
-                       elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
-                       {
-                               foreach ($ratings as $rating)
-                               {
-                                       $rating_scheme = null;
-                                       $rating_value = null;
-                                       if (isset($rating['attribs']['']['scheme']))
-                                       {
-                                               $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       else
-                                       {
-                                               $rating_scheme = 'urn:simple';
-                                       }
-                                       if (isset($rating['data']))
-                                       {
-                                               $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
-                               }
-                       }
-                       elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
-                       {
-                               foreach ($ratings as $rating)
-                               {
-                                       $rating_scheme = 'urn:itunes';
-                                       $rating_value = null;
-                                       if (isset($rating['data']))
-                                       {
-                                               $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
-                               }
-                       }
-                       if (is_array($ratings_parent))
-                       {
-                               $ratings_parent = array_values(array_unique($ratings_parent));
-                       }
-
-                       // RESTRICTIONS
-                       if ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
-                       {
-                               foreach ($restrictions as $restriction)
-                               {
-                                       $restriction_relationship = null;
-                                       $restriction_type = null;
-                                       $restriction_value = null;
-                                       if (isset($restriction['attribs']['']['relationship']))
-                                       {
-                                               $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($restriction['attribs']['']['type']))
-                                       {
-                                               $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($restriction['data']))
-                                       {
-                                               $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
-                               }
-                       }
-                       elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
-                       {
-                               foreach ($restrictions as $restriction)
-                               {
-                                       $restriction_relationship = 'allow';
-                                       $restriction_type = null;
-                                       $restriction_value = 'itunes';
-                                       if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes')
-                                       {
-                                               $restriction_relationship = 'deny';
-                                       }
-                                       $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
-                               }
-                       }
-                       elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
-                       {
-                               foreach ($restrictions as $restriction)
-                               {
-                                       $restriction_relationship = null;
-                                       $restriction_type = null;
-                                       $restriction_value = null;
-                                       if (isset($restriction['attribs']['']['relationship']))
-                                       {
-                                               $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($restriction['attribs']['']['type']))
-                                       {
-                                               $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($restriction['data']))
-                                       {
-                                               $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
-                               }
-                       }
-                       elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
-                       {
-                               foreach ($restrictions as $restriction)
-                               {
-                                       $restriction_relationship = 'allow';
-                                       $restriction_type = null;
-                                       $restriction_value = 'itunes';
-                                       if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes')
-                                       {
-                                               $restriction_relationship = 'deny';
-                                       }
-                                       $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
-                               }
-                       }
-                       if (is_array($restrictions_parent))
-                       {
-                               $restrictions_parent = array_values(array_unique($restrictions_parent));
-                       }
-                       else
-                       {
-                               $restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default'));
-                       }
-
-                       // THUMBNAILS
-                       if ($thumbnails = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
-                       {
-                               foreach ($thumbnails as $thumbnail)
-                               {
-                                       if (isset($thumbnail['attribs']['']['url']))
-                                       {
-                                               $thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                       }
-                               }
-                       }
-                       elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
-                       {
-                               foreach ($thumbnails as $thumbnail)
-                               {
-                                       if (isset($thumbnail['attribs']['']['url']))
-                                       {
-                                               $thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                       }
-                               }
-                       }
-
-                       // TITLES
-                       if ($title_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
-                       {
-                               if (isset($title_parent[0]['data']))
-                               {
-                                       $title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                       }
-                       elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
-                       {
-                               if (isset($title_parent[0]['data']))
-                               {
-                                       $title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                               }
-                       }
-
-                       // Clear the memory
-                       unset($parent);
-
-                       // Attributes
-                       $bitrate = null;
-                       $channels = null;
-                       $duration = null;
-                       $expression = null;
-                       $framerate = null;
-                       $height = null;
-                       $javascript = null;
-                       $lang = null;
-                       $length = null;
-                       $medium = null;
-                       $samplingrate = null;
-                       $type = null;
-                       $url = null;
-                       $width = null;
-
-                       // Elements
-                       $captions = null;
-                       $categories = null;
-                       $copyrights = null;
-                       $credits = null;
-                       $description = null;
-                       $hashes = null;
-                       $keywords = null;
-                       $player = null;
-                       $ratings = null;
-                       $restrictions = null;
-                       $thumbnails = null;
-                       $title = null;
-
-                       // If we have media:group tags, loop through them.
-                       foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
-                       {
-                               if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
-                               {
-                                       // If we have media:content tags, loop through them.
-                                       foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
-                                       {
-                                               if (isset($content['attribs']['']['url']))
-                                               {
-                                                       // Attributes
-                                                       $bitrate = null;
-                                                       $channels = null;
-                                                       $duration = null;
-                                                       $expression = null;
-                                                       $framerate = null;
-                                                       $height = null;
-                                                       $javascript = null;
-                                                       $lang = null;
-                                                       $length = null;
-                                                       $medium = null;
-                                                       $samplingrate = null;
-                                                       $type = null;
-                                                       $url = null;
-                                                       $width = null;
-
-                                                       // Elements
-                                                       $captions = null;
-                                                       $categories = null;
-                                                       $copyrights = null;
-                                                       $credits = null;
-                                                       $description = null;
-                                                       $hashes = null;
-                                                       $keywords = null;
-                                                       $player = null;
-                                                       $ratings = null;
-                                                       $restrictions = null;
-                                                       $thumbnails = null;
-                                                       $title = null;
-
-                                                       // Start checking the attributes of media:content
-                                                       if (isset($content['attribs']['']['bitrate']))
-                                                       {
-                                                               $bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['channels']))
-                                                       {
-                                                               $channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['duration']))
-                                                       {
-                                                               $duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       else
-                                                       {
-                                                               $duration = $duration_parent;
-                                                       }
-                                                       if (isset($content['attribs']['']['expression']))
-                                                       {
-                                                               $expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['framerate']))
-                                                       {
-                                                               $framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['height']))
-                                                       {
-                                                               $height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['lang']))
-                                                       {
-                                                               $lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['fileSize']))
-                                                       {
-                                                               $length = intval($content['attribs']['']['fileSize']);
-                                                       }
-                                                       if (isset($content['attribs']['']['medium']))
-                                                       {
-                                                               $medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['samplingrate']))
-                                                       {
-                                                               $samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['type']))
-                                                       {
-                                                               $type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['attribs']['']['width']))
-                                                       {
-                                                               $width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       $url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-
-                                                       // Checking the other optional media: elements. Priority: media:content, media:group, item, channel
-
-                                                       // CAPTIONS
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
-                                                       {
-                                                               foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
-                                                               {
-                                                                       $caption_type = null;
-                                                                       $caption_lang = null;
-                                                                       $caption_startTime = null;
-                                                                       $caption_endTime = null;
-                                                                       $caption_text = null;
-                                                                       if (isset($caption['attribs']['']['type']))
-                                                                       {
-                                                                               $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($caption['attribs']['']['lang']))
-                                                                       {
-                                                                               $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($caption['attribs']['']['start']))
-                                                                       {
-                                                                               $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($caption['attribs']['']['end']))
-                                                                       {
-                                                                               $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($caption['data']))
-                                                                       {
-                                                                               $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
-                                                               }
-                                                               if (is_array($captions))
-                                                               {
-                                                                       $captions = array_values(array_unique($captions));
-                                                               }
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
-                                                       {
-                                                               foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
-                                                               {
-                                                                       $caption_type = null;
-                                                                       $caption_lang = null;
-                                                                       $caption_startTime = null;
-                                                                       $caption_endTime = null;
-                                                                       $caption_text = null;
-                                                                       if (isset($caption['attribs']['']['type']))
-                                                                       {
-                                                                               $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($caption['attribs']['']['lang']))
-                                                                       {
-                                                                               $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($caption['attribs']['']['start']))
-                                                                       {
-                                                                               $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($caption['attribs']['']['end']))
-                                                                       {
-                                                                               $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($caption['data']))
-                                                                       {
-                                                                               $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
-                                                               }
-                                                               if (is_array($captions))
-                                                               {
-                                                                       $captions = array_values(array_unique($captions));
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               $captions = $captions_parent;
-                                                       }
-
-                                                       // CATEGORIES
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
-                                                       {
-                                                               foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
-                                                               {
-                                                                       $term = null;
-                                                                       $scheme = null;
-                                                                       $label = null;
-                                                                       if (isset($category['data']))
-                                                                       {
-                                                                               $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($category['attribs']['']['scheme']))
-                                                                       {
-                                                                               $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               $scheme = 'http://search.yahoo.com/mrss/category_schema';
-                                                                       }
-                                                                       if (isset($category['attribs']['']['label']))
-                                                                       {
-                                                                               $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $categories[] = $this->registry->create('Category', array($term, $scheme, $label));
-                                                               }
-                                                       }
-                                                       if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
-                                                       {
-                                                               foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
-                                                               {
-                                                                       $term = null;
-                                                                       $scheme = null;
-                                                                       $label = null;
-                                                                       if (isset($category['data']))
-                                                                       {
-                                                                               $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($category['attribs']['']['scheme']))
-                                                                       {
-                                                                               $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               $scheme = 'http://search.yahoo.com/mrss/category_schema';
-                                                                       }
-                                                                       if (isset($category['attribs']['']['label']))
-                                                                       {
-                                                                               $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $categories[] = $this->registry->create('Category', array($term, $scheme, $label));
-                                                               }
-                                                       }
-                                                       if (is_array($categories) && is_array($categories_parent))
-                                                       {
-                                                               $categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-                                                       }
-                                                       elseif (is_array($categories))
-                                                       {
-                                                               $categories = array_values(array_unique($categories));
-                                                       }
-                                                       elseif (is_array($categories_parent))
-                                                       {
-                                                               $categories = array_values(array_unique($categories_parent));
-                                                       }
-
-                                                       // COPYRIGHTS
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
-                                                       {
-                                                               $copyright_url = null;
-                                                               $copyright_label = null;
-                                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
-                                                               {
-                                                                       $copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
-                                                               {
-                                                                       $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
-                                                       {
-                                                               $copyright_url = null;
-                                                               $copyright_label = null;
-                                                               if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
-                                                               {
-                                                                       $copyright_url = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
-                                                               {
-                                                                       $copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-                                                       }
-                                                       else
-                                                       {
-                                                               $copyrights = $copyrights_parent;
-                                                       }
-
-                                                       // CREDITS
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
-                                                       {
-                                                               foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
-                                                               {
-                                                                       $credit_role = null;
-                                                                       $credit_scheme = null;
-                                                                       $credit_name = null;
-                                                                       if (isset($credit['attribs']['']['role']))
-                                                                       {
-                                                                               $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($credit['attribs']['']['scheme']))
-                                                                       {
-                                                                               $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               $credit_scheme = 'urn:ebu';
-                                                                       }
-                                                                       if (isset($credit['data']))
-                                                                       {
-                                                                               $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
-                                                               }
-                                                               if (is_array($credits))
-                                                               {
-                                                                       $credits = array_values(array_unique($credits));
-                                                               }
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
-                                                       {
-                                                               foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
-                                                               {
-                                                                       $credit_role = null;
-                                                                       $credit_scheme = null;
-                                                                       $credit_name = null;
-                                                                       if (isset($credit['attribs']['']['role']))
-                                                                       {
-                                                                               $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($credit['attribs']['']['scheme']))
-                                                                       {
-                                                                               $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               $credit_scheme = 'urn:ebu';
-                                                                       }
-                                                                       if (isset($credit['data']))
-                                                                       {
-                                                                               $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
-                                                               }
-                                                               if (is_array($credits))
-                                                               {
-                                                                       $credits = array_values(array_unique($credits));
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               $credits = $credits_parent;
-                                                       }
-
-                                                       // DESCRIPTION
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
-                                                       {
-                                                               $description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
-                                                       {
-                                                               $description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       else
-                                                       {
-                                                               $description = $description_parent;
-                                                       }
-
-                                                       // HASHES
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
-                                                       {
-                                                               foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
-                                                               {
-                                                                       $value = null;
-                                                                       $algo = null;
-                                                                       if (isset($hash['data']))
-                                                                       {
-                                                                               $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($hash['attribs']['']['algo']))
-                                                                       {
-                                                                               $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               $algo = 'md5';
-                                                                       }
-                                                                       $hashes[] = $algo.':'.$value;
-                                                               }
-                                                               if (is_array($hashes))
-                                                               {
-                                                                       $hashes = array_values(array_unique($hashes));
-                                                               }
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
-                                                       {
-                                                               foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
-                                                               {
-                                                                       $value = null;
-                                                                       $algo = null;
-                                                                       if (isset($hash['data']))
-                                                                       {
-                                                                               $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($hash['attribs']['']['algo']))
-                                                                       {
-                                                                               $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               $algo = 'md5';
-                                                                       }
-                                                                       $hashes[] = $algo.':'.$value;
-                                                               }
-                                                               if (is_array($hashes))
-                                                               {
-                                                                       $hashes = array_values(array_unique($hashes));
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               $hashes = $hashes_parent;
-                                                       }
-
-                                                       // KEYWORDS
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
-                                                       {
-                                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
-                                                               {
-                                                                       $temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-                                                                       foreach ($temp as $word)
-                                                                       {
-                                                                               $keywords[] = trim($word);
-                                                                       }
-                                                                       unset($temp);
-                                                               }
-                                                               if (is_array($keywords))
-                                                               {
-                                                                       $keywords = array_values(array_unique($keywords));
-                                                               }
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
-                                                       {
-                                                               if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
-                                                               {
-                                                                       $temp = explode(',', $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-                                                                       foreach ($temp as $word)
-                                                                       {
-                                                                               $keywords[] = trim($word);
-                                                                       }
-                                                                       unset($temp);
-                                                               }
-                                                               if (is_array($keywords))
-                                                               {
-                                                                       $keywords = array_values(array_unique($keywords));
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               $keywords = $keywords_parent;
-                                                       }
-
-                                                       // PLAYER
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
-                                                       {
-                                                               $player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
-                                                       {
-                                                               $player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                                       }
-                                                       else
-                                                       {
-                                                               $player = $player_parent;
-                                                       }
-
-                                                       // RATINGS
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
-                                                       {
-                                                               foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
-                                                               {
-                                                                       $rating_scheme = null;
-                                                                       $rating_value = null;
-                                                                       if (isset($rating['attribs']['']['scheme']))
-                                                                       {
-                                                                               $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               $rating_scheme = 'urn:simple';
-                                                                       }
-                                                                       if (isset($rating['data']))
-                                                                       {
-                                                                               $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
-                                                               }
-                                                               if (is_array($ratings))
-                                                               {
-                                                                       $ratings = array_values(array_unique($ratings));
-                                                               }
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
-                                                       {
-                                                               foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
-                                                               {
-                                                                       $rating_scheme = null;
-                                                                       $rating_value = null;
-                                                                       if (isset($rating['attribs']['']['scheme']))
-                                                                       {
-                                                                               $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               $rating_scheme = 'urn:simple';
-                                                                       }
-                                                                       if (isset($rating['data']))
-                                                                       {
-                                                                               $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
-                                                               }
-                                                               if (is_array($ratings))
-                                                               {
-                                                                       $ratings = array_values(array_unique($ratings));
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               $ratings = $ratings_parent;
-                                                       }
-
-                                                       // RESTRICTIONS
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
-                                                       {
-                                                               foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
-                                                               {
-                                                                       $restriction_relationship = null;
-                                                                       $restriction_type = null;
-                                                                       $restriction_value = null;
-                                                                       if (isset($restriction['attribs']['']['relationship']))
-                                                                       {
-                                                                               $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($restriction['attribs']['']['type']))
-                                                                       {
-                                                                               $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($restriction['data']))
-                                                                       {
-                                                                               $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
-                                                               }
-                                                               if (is_array($restrictions))
-                                                               {
-                                                                       $restrictions = array_values(array_unique($restrictions));
-                                                               }
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
-                                                       {
-                                                               foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
-                                                               {
-                                                                       $restriction_relationship = null;
-                                                                       $restriction_type = null;
-                                                                       $restriction_value = null;
-                                                                       if (isset($restriction['attribs']['']['relationship']))
-                                                                       {
-                                                                               $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($restriction['attribs']['']['type']))
-                                                                       {
-                                                                               $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       if (isset($restriction['data']))
-                                                                       {
-                                                                               $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                                       }
-                                                                       $restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
-                                                               }
-                                                               if (is_array($restrictions))
-                                                               {
-                                                                       $restrictions = array_values(array_unique($restrictions));
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               $restrictions = $restrictions_parent;
-                                                       }
-
-                                                       // THUMBNAILS
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
-                                                       {
-                                                               foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
-                                                               {
-                                                                       $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                                               }
-                                                               if (is_array($thumbnails))
-                                                               {
-                                                                       $thumbnails = array_values(array_unique($thumbnails));
-                                                               }
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
-                                                       {
-                                                               foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
-                                                               {
-                                                                       $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                                               }
-                                                               if (is_array($thumbnails))
-                                                               {
-                                                                       $thumbnails = array_values(array_unique($thumbnails));
-                                                               }
-                                                       }
-                                                       else
-                                                       {
-                                                               $thumbnails = $thumbnails_parent;
-                                                       }
-
-                                                       // TITLES
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
-                                                       {
-                                                               $title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
-                                                       {
-                                                               $title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       else
-                                                       {
-                                                               $title = $title_parent;
-                                                       }
-
-                                                       $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width));
-                                               }
-                                       }
-                               }
-                       }
-
-                       // If we have standalone media:content tags, loop through them.
-                       if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
-                       {
-                               foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
-                               {
-                                       if (isset($content['attribs']['']['url']) || isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
-                                       {
-                                               // Attributes
-                                               $bitrate = null;
-                                               $channels = null;
-                                               $duration = null;
-                                               $expression = null;
-                                               $framerate = null;
-                                               $height = null;
-                                               $javascript = null;
-                                               $lang = null;
-                                               $length = null;
-                                               $medium = null;
-                                               $samplingrate = null;
-                                               $type = null;
-                                               $url = null;
-                                               $width = null;
-
-                                               // Elements
-                                               $captions = null;
-                                               $categories = null;
-                                               $copyrights = null;
-                                               $credits = null;
-                                               $description = null;
-                                               $hashes = null;
-                                               $keywords = null;
-                                               $player = null;
-                                               $ratings = null;
-                                               $restrictions = null;
-                                               $thumbnails = null;
-                                               $title = null;
-
-                                               // Start checking the attributes of media:content
-                                               if (isset($content['attribs']['']['bitrate']))
-                                               {
-                                                       $bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['channels']))
-                                               {
-                                                       $channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['duration']))
-                                               {
-                                                       $duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               else
-                                               {
-                                                       $duration = $duration_parent;
-                                               }
-                                               if (isset($content['attribs']['']['expression']))
-                                               {
-                                                       $expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['framerate']))
-                                               {
-                                                       $framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['height']))
-                                               {
-                                                       $height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['lang']))
-                                               {
-                                                       $lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['fileSize']))
-                                               {
-                                                       $length = intval($content['attribs']['']['fileSize']);
-                                               }
-                                               if (isset($content['attribs']['']['medium']))
-                                               {
-                                                       $medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['samplingrate']))
-                                               {
-                                                       $samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['type']))
-                                               {
-                                                       $type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['width']))
-                                               {
-                                                       $width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               if (isset($content['attribs']['']['url']))
-                                               {
-                                                       $url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                               }
-                                               // Checking the other optional media: elements. Priority: media:content, media:group, item, channel
-
-                                               // CAPTIONS
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
-                                               {
-                                                       foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
-                                                       {
-                                                               $caption_type = null;
-                                                               $caption_lang = null;
-                                                               $caption_startTime = null;
-                                                               $caption_endTime = null;
-                                                               $caption_text = null;
-                                                               if (isset($caption['attribs']['']['type']))
-                                                               {
-                                                                       $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($caption['attribs']['']['lang']))
-                                                               {
-                                                                       $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($caption['attribs']['']['start']))
-                                                               {
-                                                                       $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($caption['attribs']['']['end']))
-                                                               {
-                                                                       $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($caption['data']))
-                                                               {
-                                                                       $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               $captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
-                                                       }
-                                                       if (is_array($captions))
-                                                       {
-                                                               $captions = array_values(array_unique($captions));
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $captions = $captions_parent;
-                                               }
-
-                                               // CATEGORIES
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
-                                               {
-                                                       foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
-                                                       {
-                                                               $term = null;
-                                                               $scheme = null;
-                                                               $label = null;
-                                                               if (isset($category['data']))
-                                                               {
-                                                                       $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($category['attribs']['']['scheme']))
-                                                               {
-                                                                       $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               else
-                                                               {
-                                                                       $scheme = 'http://search.yahoo.com/mrss/category_schema';
-                                                               }
-                                                               if (isset($category['attribs']['']['label']))
-                                                               {
-                                                                       $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               $categories[] = $this->registry->create('Category', array($term, $scheme, $label));
-                                                       }
-                                               }
-                                               if (is_array($categories) && is_array($categories_parent))
-                                               {
-                                                       $categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-                                               }
-                                               elseif (is_array($categories))
-                                               {
-                                                       $categories = array_values(array_unique($categories));
-                                               }
-                                               elseif (is_array($categories_parent))
-                                               {
-                                                       $categories = array_values(array_unique($categories_parent));
-                                               }
-                                               else
-                                               {
-                                                       $categories = null;
-                                               }
-
-                                               // COPYRIGHTS
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
-                                               {
-                                                       $copyright_url = null;
-                                                       $copyright_label = null;
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
-                                                       {
-                                                               $copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
-                                                       {
-                                                               $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                       }
-                                                       $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-                                               }
-                                               else
-                                               {
-                                                       $copyrights = $copyrights_parent;
-                                               }
-
-                                               // CREDITS
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
-                                               {
-                                                       foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
-                                                       {
-                                                               $credit_role = null;
-                                                               $credit_scheme = null;
-                                                               $credit_name = null;
-                                                               if (isset($credit['attribs']['']['role']))
-                                                               {
-                                                                       $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($credit['attribs']['']['scheme']))
-                                                               {
-                                                                       $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               else
-                                                               {
-                                                                       $credit_scheme = 'urn:ebu';
-                                                               }
-                                                               if (isset($credit['data']))
-                                                               {
-                                                                       $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               $credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
-                                                       }
-                                                       if (is_array($credits))
-                                                       {
-                                                               $credits = array_values(array_unique($credits));
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $credits = $credits_parent;
-                                               }
-
-                                               // DESCRIPTION
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
-                                               {
-                                                       $description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               else
-                                               {
-                                                       $description = $description_parent;
-                                               }
-
-                                               // HASHES
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
-                                               {
-                                                       foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
-                                                       {
-                                                               $value = null;
-                                                               $algo = null;
-                                                               if (isset($hash['data']))
-                                                               {
-                                                                       $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($hash['attribs']['']['algo']))
-                                                               {
-                                                                       $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               else
-                                                               {
-                                                                       $algo = 'md5';
-                                                               }
-                                                               $hashes[] = $algo.':'.$value;
-                                                       }
-                                                       if (is_array($hashes))
-                                                       {
-                                                               $hashes = array_values(array_unique($hashes));
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $hashes = $hashes_parent;
-                                               }
-
-                                               // KEYWORDS
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
-                                               {
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
-                                                       {
-                                                               $temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-                                                               foreach ($temp as $word)
-                                                               {
-                                                                       $keywords[] = trim($word);
-                                                               }
-                                                               unset($temp);
-                                                       }
-                                                       if (is_array($keywords))
-                                                       {
-                                                               $keywords = array_values(array_unique($keywords));
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $keywords = $keywords_parent;
-                                               }
-
-                                               // PLAYER
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
-                                               {
-                                                       if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'])) {
-                                                               $player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $player = $player_parent;
-                                               }
-
-                                               // RATINGS
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
-                                               {
-                                                       foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
-                                                       {
-                                                               $rating_scheme = null;
-                                                               $rating_value = null;
-                                                               if (isset($rating['attribs']['']['scheme']))
-                                                               {
-                                                                       $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               else
-                                                               {
-                                                                       $rating_scheme = 'urn:simple';
-                                                               }
-                                                               if (isset($rating['data']))
-                                                               {
-                                                                       $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               $ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
-                                                       }
-                                                       if (is_array($ratings))
-                                                       {
-                                                               $ratings = array_values(array_unique($ratings));
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $ratings = $ratings_parent;
-                                               }
-
-                                               // RESTRICTIONS
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
-                                               {
-                                                       foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
-                                                       {
-                                                               $restriction_relationship = null;
-                                                               $restriction_type = null;
-                                                               $restriction_value = null;
-                                                               if (isset($restriction['attribs']['']['relationship']))
-                                                               {
-                                                                       $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($restriction['attribs']['']['type']))
-                                                               {
-                                                                       $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               if (isset($restriction['data']))
-                                                               {
-                                                                       $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                                               }
-                                                               $restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
-                                                       }
-                                                       if (is_array($restrictions))
-                                                       {
-                                                               $restrictions = array_values(array_unique($restrictions));
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $restrictions = $restrictions_parent;
-                                               }
-
-                                               // THUMBNAILS
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
-                                               {
-                                                       foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
-                                                       {
-                                                               if (isset($thumbnail['attribs']['']['url'])) {
-                                                                       $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                                                               }
-                                                       }
-                                                       if (is_array($thumbnails))
-                                                       {
-                                                               $thumbnails = array_values(array_unique($thumbnails));
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $thumbnails = $thumbnails_parent;
-                                               }
-
-                                               // TITLES
-                                               if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
-                                               {
-                                                       $title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                               }
-                                               else
-                                               {
-                                                       $title = $title_parent;
-                                               }
-
-                                               $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width));
-                                       }
-                               }
-                       }
-
-                       foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
-                       {
-                               if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
-                               {
-                                       // Attributes
-                                       $bitrate = null;
-                                       $channels = null;
-                                       $duration = null;
-                                       $expression = null;
-                                       $framerate = null;
-                                       $height = null;
-                                       $javascript = null;
-                                       $lang = null;
-                                       $length = null;
-                                       $medium = null;
-                                       $samplingrate = null;
-                                       $type = null;
-                                       $url = null;
-                                       $width = null;
-
-                                       $url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-                                       if (isset($link['attribs']['']['type']))
-                                       {
-                                               $type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($link['attribs']['']['length']))
-                                       {
-                                               $length = intval($link['attribs']['']['length']);
-                                       }
-                                       if (isset($link['attribs']['']['title']))
-                                       {
-                                               $title = $this->sanitize($link['attribs']['']['title'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       else
-                                       {
-                                               $title = $title_parent;
-                                       }
-
-                                       // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-                                       $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title, $width));
-                               }
-                       }
-
-                       foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
-                       {
-                               if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
-                               {
-                                       // Attributes
-                                       $bitrate = null;
-                                       $channels = null;
-                                       $duration = null;
-                                       $expression = null;
-                                       $framerate = null;
-                                       $height = null;
-                                       $javascript = null;
-                                       $lang = null;
-                                       $length = null;
-                                       $medium = null;
-                                       $samplingrate = null;
-                                       $type = null;
-                                       $url = null;
-                                       $width = null;
-
-                                       $url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-                                       if (isset($link['attribs']['']['type']))
-                                       {
-                                               $type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($link['attribs']['']['length']))
-                                       {
-                                               $length = intval($link['attribs']['']['length']);
-                                       }
-
-                                       // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-                                       $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
-                               }
-                       }
-
-                       if ($enclosure = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'enclosure'))
-                       {
-                               if (isset($enclosure[0]['attribs']['']['url']))
-                               {
-                                       // Attributes
-                                       $bitrate = null;
-                                       $channels = null;
-                                       $duration = null;
-                                       $expression = null;
-                                       $framerate = null;
-                                       $height = null;
-                                       $javascript = null;
-                                       $lang = null;
-                                       $length = null;
-                                       $medium = null;
-                                       $samplingrate = null;
-                                       $type = null;
-                                       $url = null;
-                                       $width = null;
-
-                                       $url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0]));
-                                       $url = $this->feed->sanitize->https_url($url);
-                                       if (isset($enclosure[0]['attribs']['']['type']))
-                                       {
-                                               $type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                       }
-                                       if (isset($enclosure[0]['attribs']['']['length']))
-                                       {
-                                               $length = intval($enclosure[0]['attribs']['']['length']);
-                                       }
-
-                                       // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-                                       $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
-                               }
-                       }
-
-                       if (sizeof($this->data['enclosures']) === 0 && ($url || $type || $length || $bitrate || $captions_parent || $categories_parent || $channels || $copyrights_parent || $credits_parent || $description_parent || $duration_parent || $expression || $framerate || $hashes_parent || $height || $keywords_parent || $lang || $medium || $player_parent || $ratings_parent || $restrictions_parent || $samplingrate || $thumbnails_parent || $title_parent || $width))
-                       {
-                               // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-                               $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
-                       }
-
-                       $this->data['enclosures'] = array_values(array_unique($this->data['enclosures']));
-               }
-               if (!empty($this->data['enclosures']))
-               {
-                       return $this->data['enclosures'];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the latitude coordinates for the item
-        *
-        * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
-        *
-        * Uses `<geo:lat>` or `<georss:point>`
-        *
-        * @since 1.0
-        * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
-        * @link http://www.georss.org/ GeoRSS
-        * @return string|null
-        */
-       public function get_latitude()
-       {
-               if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
-               {
-                       return (float) $match[1];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the longitude coordinates for the item
-        *
-        * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
-        *
-        * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>`
-        *
-        * @since 1.0
-        * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
-        * @link http://www.georss.org/ GeoRSS
-        * @return string|null
-        */
-       public function get_longitude()
-       {
-               if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
-               {
-                       return (float) $match[2];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the `<atom:source>` for the item
-        *
-        * @since 1.1
-        * @return SimplePie_Source|null
-        */
-       public function get_source()
-       {
-               if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source'))
-               {
-                       return $this->registry->create('Source', array($this, $return[0]));
-               }
-
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieLocatorphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Locator.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Locator.php       2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Locator.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,432 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Used for feed auto-discovery
- *
- *
- * This class can be overloaded with {@see SimplePie::set_locator_class()}
- *
- * @package SimplePie
- */
-class SimplePie_Locator
-{
-       var $useragent;
-       var $timeout;
-       var $file;
-       var $local = array();
-       var $elsewhere = array();
-       var $cached_entities = array();
-       var $http_base;
-       var $base;
-       var $base_location = 0;
-       var $checked_feeds = 0;
-       var $max_checked_feeds = 10;
-       var $force_fsockopen = false;
-       var $curl_options = array();
-       var $dom;
-       protected $registry;
-
-       public function __construct(SimplePie_File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10, $force_fsockopen = false, $curl_options = array())
-       {
-               $this->file = $file;
-               $this->useragent = $useragent;
-               $this->timeout = $timeout;
-               $this->max_checked_feeds = $max_checked_feeds;
-               $this->force_fsockopen = $force_fsockopen;
-               $this->curl_options = $curl_options;
-
-               if (class_exists('DOMDocument') && $this->file->body != '')
-               {
-                       $this->dom = new DOMDocument();
-
-                       set_error_handler(array('SimplePie_Misc', 'silence_errors'));
-                       try
-                       {
-                               $this->dom->loadHTML($this->file->body);
-                       }
-                       catch (Throwable $ex)
-                       {
-                               $this->dom = null;
-                       }
-                       restore_error_handler();
-               }
-               else
-               {
-                       $this->dom = null;
-               }
-       }
-
-       public function set_registry(SimplePie_Registry $registry)
-       {
-               $this->registry = $registry;
-       }
-
-       public function find($type = SIMPLEPIE_LOCATOR_ALL, &$working = null)
-       {
-               if ($this->is_feed($this->file))
-               {
-                       return $this->file;
-               }
-
-               if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
-               {
-                       $sniffer = $this->registry->create('Content_Type_Sniffer', array($this->file));
-                       if ($sniffer->get_type() !== 'text/html')
-                       {
-                               return null;
-                       }
-               }
-
-               if ($type & ~SIMPLEPIE_LOCATOR_NONE)
-               {
-                       $this->get_base();
-               }
-
-               if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
-               {
-                       return $working[0];
-               }
-
-               if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
-               {
-                       if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
-                       {
-                               return $working[0];
-                       }
-
-                       if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
-                       {
-                               return $working[0];
-                       }
-
-                       if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
-                       {
-                               return $working[0];
-                       }
-
-                       if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
-                       {
-                               return $working[0];
-                       }
-               }
-               return null;
-       }
-
-       public function is_feed($file, $check_html = false)
-       {
-               if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
-               {
-                       $sniffer = $this->registry->create('Content_Type_Sniffer', array($file));
-                       $sniffed = $sniffer->get_type();
-                       $mime_types = array('application/rss+xml', 'application/rdf+xml',
-                                           'text/rdf', 'application/atom+xml', 'text/xml',
-                                           'application/xml', 'application/x-rss+xml');
-                       if ($check_html)
-                       {
-                               $mime_types[] = 'text/html';
-                       }
-
-                       return in_array($sniffed, $mime_types);
-               }
-               elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
-               {
-                       return true;
-               }
-               else
-               {
-                       return false;
-               }
-       }
-
-       public function get_base()
-       {
-               if ($this->dom === null)
-               {
-                       throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
-               }
-               $this->http_base = $this->file->url;
-               $this->base = $this->http_base;
-               $elements = $this->dom->getElementsByTagName('base');
-               foreach ($elements as $element)
-               {
-                       if ($element->hasAttribute('href'))
-                       {
-                               $base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
-                               if ($base === false)
-                               {
-                                       continue;
-                               }
-                               $this->base = $base;
-                               $this->base_location = method_exists($element, 'getLineNo') ? $element->getLineNo() : 0;
-                               break;
-                       }
-               }
-       }
-
-       public function autodiscovery()
-       {
-               $done = array();
-               $feeds = array();
-               $feeds = array_merge($feeds, $this->search_elements_by_tag('link', $done, $feeds));
-               $feeds = array_merge($feeds, $this->search_elements_by_tag('a', $done, $feeds));
-               $feeds = array_merge($feeds, $this->search_elements_by_tag('area', $done, $feeds));
-
-               if (!empty($feeds))
-               {
-                       return array_values($feeds);
-               }
-
-               return null;
-       }
-
-       protected function search_elements_by_tag($name, &$done, $feeds)
-       {
-               if ($this->dom === null)
-               {
-                       throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
-               }
-
-               $links = $this->dom->getElementsByTagName($name);
-               foreach ($links as $link)
-               {
-                       if ($this->checked_feeds === $this->max_checked_feeds)
-                       {
-                               break;
-                       }
-                       if ($link->hasAttribute('href') && $link->hasAttribute('rel'))
-                       {
-                               $rel = array_unique($this->registry->call('Misc', 'space_separated_tokens', array(strtolower($link->getAttribute('rel')))));
-                               $line = method_exists($link, 'getLineNo') ? $link->getLineNo() : 1;
-
-                               if ($this->base_location < $line)
-                               {
-                                       $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
-                               }
-                               else
-                               {
-                                       $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
-                               }
-                               if ($href === false)
-                               {
-                                       continue;
-                               }
-
-                               if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !in_array('stylesheet', $rel) && $link->hasAttribute('type') && in_array(strtolower($this->registry->call('Misc', 'parse_mime', array($link->getAttribute('type')))), array('text/html', 'application/rss+xml', 'application/atom+xml'))) && !isset($feeds[$href]))
-                               {
-                                       $this->checked_feeds++;
-                                       $headers = array(
-                                               'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
-                                       );
-                                       $feed = $this->registry->create('File', array($href, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
-                                       if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed, true))
-                                       {
-                                               $feeds[$href] = $feed;
-                                       }
-                               }
-                               $done[] = $href;
-                       }
-               }
-
-               return $feeds;
-       }
-
-       public function get_links()
-       {
-               if ($this->dom === null)
-               {
-                       throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
-               }
-
-               $links = $this->dom->getElementsByTagName('a');
-               foreach ($links as $link)
-               {
-                       if ($link->hasAttribute('href'))
-                       {
-                               $href = trim($link->getAttribute('href'));
-                               $parsed = $this->registry->call('Misc', 'parse_url', array($href));
-                               if ($parsed['scheme'] === '' || preg_match('/^(https?|feed)?$/i', $parsed['scheme']))
-                               {
-                                       if (method_exists($link, 'getLineNo') && $this->base_location < $link->getLineNo())
-                                       {
-                                               $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
-                                       }
-                                       else
-                                       {
-                                               $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
-                                       }
-                                       if ($href === false)
-                                       {
-                                               continue;
-                                       }
-
-                                       $current = $this->registry->call('Misc', 'parse_url', array($this->file->url));
-
-                                       if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority'])
-                                       {
-                                               $this->local[] = $href;
-                                       }
-                                       else
-                                       {
-                                               $this->elsewhere[] = $href;
-                                       }
-                               }
-                       }
-               }
-               $this->local = array_unique($this->local);
-               $this->elsewhere = array_unique($this->elsewhere);
-               if (!empty($this->local) || !empty($this->elsewhere))
-               {
-                       return true;
-               }
-               return null;
-       }
-
-       public function get_rel_link($rel)
-       {
-               if ($this->dom === null)
-               {
-                       throw new SimplePie_Exception('DOMDocument not found, unable to use '.
-                                                     'locator');
-               }
-               if (!class_exists('DOMXpath'))
-               {
-                       throw new SimplePie_Exception('DOMXpath not found, unable to use '.
-                                                     'get_rel_link');
-               }
-
-               $xpath = new DOMXpath($this->dom);
-               $query = '//a[@rel and @href] | //link[@rel and @href]';
-               foreach ($xpath->query($query) as $link)
-               {
-                       $href = trim($link->getAttribute('href'));
-                       $parsed = $this->registry->call('Misc', 'parse_url', array($href));
-                       if ($parsed['scheme'] === '' ||
-                           preg_match('/^https?$/i', $parsed['scheme']))
-                       {
-                               if (method_exists($link, 'getLineNo') &&
-                                   $this->base_location < $link->getLineNo())
-                               {
-                                       $href =
-                                               $this->registry->call('Misc', 'absolutize_url',
-                                                                     array(trim($link->getAttribute('href')),
-                                                                           $this->base));
-                               }
-                               else
-                               {
-                                       $href =
-                                               $this->registry->call('Misc', 'absolutize_url',
-                                                                     array(trim($link->getAttribute('href')),
-                                                                           $this->http_base));
-                               }
-                               if ($href === false)
-                               {
-                                       return null;
-                               }
-                               $rel_values = explode(' ', strtolower($link->getAttribute('rel')));
-                               if (in_array($rel, $rel_values))
-                               {
-                                       return $href;
-                               }
-                       }
-               }
-               return null;
-       }
-
-       public function extension(&$array)
-       {
-               foreach ($array as $key => $value)
-               {
-                       if ($this->checked_feeds === $this->max_checked_feeds)
-                       {
-                               break;
-                       }
-                       if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml')))
-                       {
-                               $this->checked_feeds++;
-
-                               $headers = array(
-                                       'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
-                               );
-                               $feed = $this->registry->create('File', array($value, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
-                               if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
-                               {
-                                       return array($feed);
-                               }
-                               else
-                               {
-                                       unset($array[$key]);
-                               }
-                       }
-               }
-               return null;
-       }
-
-       public function body(&$array)
-       {
-               foreach ($array as $key => $value)
-               {
-                       if ($this->checked_feeds === $this->max_checked_feeds)
-                       {
-                               break;
-                       }
-                       if (preg_match('/(feed|rss|rdf|atom|xml)/i', $value))
-                       {
-                               $this->checked_feeds++;
-                               $headers = array(
-                                       'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
-                               );
-                               $feed = $this->registry->create('File', array($value, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen, $this->curl_options));
-                               if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
-                               {
-                                       return array($feed);
-                               }
-                               else
-                               {
-                                       unset($array[$key]);
-                               }
-                       }
-               }
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieMiscphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Misc.php  2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Misc.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,2273 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Miscellanous utilities
- *
- * @package SimplePie
- */
-class SimplePie_Misc
-{
-       public static function time_hms($seconds)
-       {
-               $time = '';
-
-               $hours = floor($seconds / 3600);
-               $remainder = $seconds % 3600;
-               if ($hours > 0)
-               {
-                       $time .= $hours.':';
-               }
-
-               $minutes = floor($remainder / 60);
-               $seconds = $remainder % 60;
-               if ($minutes < 10 && $hours > 0)
-               {
-                       $minutes = '0' . $minutes;
-               }
-               if ($seconds < 10)
-               {
-                       $seconds = '0' . $seconds;
-               }
-
-               $time .= $minutes.':';
-               $time .= $seconds;
-
-               return $time;
-       }
-
-       public static function absolutize_url($relative, $base)
-       {
-               $iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
-               if ($iri === false)
-               {
-                       return false;
-               }
-               return $iri->get_uri();
-       }
-
-       /**
-        * Get a HTML/XML element from a HTML string
-        *
-        * @deprecated Use DOMDocument instead (parsing HTML with regex is bad!)
-        * @param string $realname Element name (including namespace prefix if applicable)
-        * @param string $string HTML document
-        * @return array
-        */
-       public static function get_element($realname, $string)
-       {
-               $return = array();
-               $name = preg_quote($realname, '/');
-               if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
-               {
-                       for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
-                       {
-                               $return[$i]['tag'] = $realname;
-                               $return[$i]['full'] = $matches[$i][0][0];
-                               $return[$i]['offset'] = $matches[$i][0][1];
-                               if (strlen($matches[$i][3][0]) <= 2)
-                               {
-                                       $return[$i]['self_closing'] = true;
-                               }
-                               else
-                               {
-                                       $return[$i]['self_closing'] = false;
-                                       $return[$i]['content'] = $matches[$i][4][0];
-                               }
-                               $return[$i]['attribs'] = array();
-                               if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
-                               {
-                                       for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
-                                       {
-                                               if (count($attribs[$j]) === 2)
-                                               {
-                                                       $attribs[$j][2] = $attribs[$j][1];
-                                               }
-                                               $return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = SimplePie_Misc::entities_decode(end($attribs[$j]));
-                                       }
-                               }
-                       }
-               }
-               return $return;
-       }
-
-       public static function element_implode($element)
-       {
-               $full = "<$element[tag]";
-               foreach ($element['attribs'] as $key => $value)
-               {
-                       $key = strtolower($key);
-                       $full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
-               }
-               if ($element['self_closing'])
-               {
-                       $full .= ' />';
-               }
-               else
-               {
-                       $full .= ">$element[content]</$element[tag]>";
-               }
-               return $full;
-       }
-
-       public static function error($message, $level, $file, $line)
-       {
-               if ((ini_get('error_reporting') & $level) > 0)
-               {
-                       switch ($level)
-                       {
-                               case E_USER_ERROR:
-                                       $note = 'PHP Error';
-                                       break;
-                               case E_USER_WARNING:
-                                       $note = 'PHP Warning';
-                                       break;
-                               case E_USER_NOTICE:
-                                       $note = 'PHP Notice';
-                                       break;
-                               default:
-                                       $note = 'Unknown Error';
-                                       break;
-                       }
-
-                       $log_error = true;
-                       if (!function_exists('error_log'))
-                       {
-                               $log_error = false;
-                       }
-
-                       $log_file = @ini_get('error_log');
-                       if (!empty($log_file) && ('syslog' !== $log_file) && !@is_writable($log_file))
-                       {
-                               $log_error = false;
-                       }
-
-                       if ($log_error)
-                       {
-                               @error_log("$note: $message in $file on line $line", 0);
-                       }
-               }
-
-               return $message;
-       }
-
-       public static function fix_protocol($url, $http = 1)
-       {
-               $url = SimplePie_Misc::normalize_url($url);
-               $parsed = SimplePie_Misc::parse_url($url);
-               if ($parsed['scheme'] !== '' && $parsed['scheme'] !== 'http' && $parsed['scheme'] !== 'https')
-               {
-                       return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['authority'], $parsed['path'], $parsed['query'], $parsed['fragment']), $http);
-               }
-
-               if ($parsed['scheme'] === '' && $parsed['authority'] === '' && !file_exists($url))
-               {
-                       return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['path'], '', $parsed['query'], $parsed['fragment']), $http);
-               }
-
-               if ($http === 2 && $parsed['scheme'] !== '')
-               {
-                       return "feed:$url";
-               }
-               elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
-               {
-                       return substr_replace($url, 'podcast', 0, 4);
-               }
-               elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
-               {
-                       return substr_replace($url, 'itpc', 0, 4);
-               }
-
-               return $url;
-       }
-
-       public static function array_merge_recursive($array1, $array2)
-       {
-               foreach ($array2 as $key => $value)
-               {
-                       if (is_array($value))
-                       {
-                               $array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
-                       }
-                       else
-                       {
-                               $array1[$key] = $value;
-                       }
-               }
-
-               return $array1;
-       }
-
-       public static function parse_url($url)
-       {
-               $iri = new SimplePie_IRI($url);
-               return array(
-                       'scheme' => (string) $iri->scheme,
-                       'authority' => (string) $iri->authority,
-                       'path' => (string) $iri->path,
-                       'query' => (string) $iri->query,
-                       'fragment' => (string) $iri->fragment
-               );
-       }
-
-       public static function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '')
-       {
-               $iri = new SimplePie_IRI('');
-               $iri->scheme = $scheme;
-               $iri->authority = $authority;
-               $iri->path = $path;
-               $iri->query = $query;
-               $iri->fragment = $fragment;
-               return $iri->get_uri();
-       }
-
-       public static function normalize_url($url)
-       {
-               $iri = new SimplePie_IRI($url);
-               return $iri->get_uri();
-       }
-
-       public static function percent_encoding_normalization($match)
-       {
-               $integer = hexdec($match[1]);
-               if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E)
-               {
-                       return chr($integer);
-               }
-
-               return strtoupper($match[0]);
-       }
-
-       /**
-        * Converts a Windows-1252 encoded string to a UTF-8 encoded string
-        *
-        * @static
-        * @param string $string Windows-1252 encoded string
-        * @return string UTF-8 encoded string
-        */
-       public static function windows_1252_to_utf8($string)
-       {
-               static $convert_table = array("\x80" => "\xE2\x82\xAC", "\x81" => "\xEF\xBF\xBD", "\x82" => "\xE2\x80\x9A", "\x83" => "\xC6\x92", "\x84" => "\xE2\x80\x9E", "\x85" => "\xE2\x80\xA6", "\x86" => "\xE2\x80\xA0", "\x87" => "\xE2\x80\xA1", "\x88" => "\xCB\x86", "\x89" => "\xE2\x80\xB0", "\x8A" => "\xC5\xA0", "\x8B" => "\xE2\x80\xB9", "\x8C" => "\xC5\x92", "\x8D" => "\xEF\xBF\xBD", "\x8E" => "\xC5\xBD", "\x8F" => "\xEF\xBF\xBD", "\x90" => "\xEF\xBF\xBD", "\x91" => "\xE2\x80\x98", "\x92" => "\xE2\x80\x99", "\x93" => "\xE2\x80\x9C", &quot
 ;\x94" => "\xE2\x80\x9D", "\x95" => "\xE2\x80\xA2", "\x96" => "\xE2\x80\x93", "\x97" => "\xE2\x80\x94", "\x98" => "\xCB\x9C", "\x99" => "\xE2\x84\xA2", "\x9A" => "\xC5\xA1", "\x9B" => "\xE2\x80\xBA", "\x9C" => "\xC5\x93", "\x9D" => "\xEF\xBF\xBD", "\x9E" => "\xC5\xBE", "\x9F" => "\xC5\xB8", "\xA0" => "\xC2\xA0", "\xA1" => "\xC2\xA1", "\xA2" => "\xC2\xA2", "\xA3" => "\xC2\xA3", "\xA4" => "\xC2\xA4", "\xA5" => "\xC2\xA5", "\xA6" => "\xC2\xA6", "\xA7" => "\xC2\xA7", "\xA8" => "\xC2\xA8", "\xA9" => "
 \xC2\xA9", "\xAA" => "\xC2\xAA", "\xAB" => "\xC2\xAB", "\xAC" => "\xC2\xAC", "\xAD" => "\xC2\xAD", "\xAE" => "\xC2\xAE", "\xAF" => "\xC2\xAF", "\xB0" => "\xC2\xB0", "\xB1" => "\xC2\xB1", "\xB2" => "\xC2\xB2", "\xB3" => "\xC2\xB3", "\xB4" => "\xC2\xB4", "\xB5" => "\xC2\xB5", "\xB6" => "\xC2\xB6", "\xB7" => "\xC2\xB7", "\xB8" => "\xC2\xB8", "\xB9" => "\xC2\xB9", "\xBA" => "\xC2\xBA", "\xBB" => "\xC2\xBB", "\xBC" => "\xC2\xBC", "\xBD" => "\xC2\xBD", "\xBE" => "\xC2\xBE", "\xBF" => "\xC2\xB
 F", "\xC0" => "\xC3\x80", "\xC1" => "\xC3\x81", "\xC2" => "\xC3\x82", "\xC3" => "\xC3\x83", "\xC4" => "\xC3\x84", "\xC5" => "\xC3\x85", "\xC6" => "\xC3\x86", "\xC7" => "\xC3\x87", "\xC8" => "\xC3\x88", "\xC9" => "\xC3\x89", "\xCA" => "\xC3\x8A", "\xCB" => "\xC3\x8B", "\xCC" => "\xC3\x8C", "\xCD" => "\xC3\x8D", "\xCE" => "\xC3\x8E", "\xCF" => "\xC3\x8F", "\xD0" => "\xC3\x90", "\xD1" => "\xC3\x91", "\xD2" => "\xC3\x92", "\xD3" => "\xC3\x93", "\xD4" => "\xC3\x94", "\xD5" => "\xC3\x95"
 , "\xD6" => "\xC3\x96", "\xD7" => "\xC3\x97", "\xD8" => "\xC3\x98", "\xD9" => "\xC3\x99", "\xDA" => "\xC3\x9A", "\xDB" => "\xC3\x9B", "\xDC" => "\xC3\x9C", "\xDD" => "\xC3\x9D", "\xDE" => "\xC3\x9E", "\xDF" => "\xC3\x9F", "\xE0" => "\xC3\xA0", "\xE1" => "\xC3\xA1", "\xE2" => "\xC3\xA2", "\xE3" => "\xC3\xA3", "\xE4" => "\xC3\xA4", "\xE5" => "\xC3\xA5", "\xE6" => "\xC3\xA6", "\xE7" => "\xC3\xA7", "\xE8" => "\xC3\xA8", "\xE9" => "\xC3\xA9", "\xEA" => "\xC3\xAA", "\xEB" => "\xC3\xAB", &quot
 ;\xEC" => "\xC3\xAC", "\xED" => "\xC3\xAD", "\xEE" => "\xC3\xAE", "\xEF" => "\xC3\xAF", "\xF0" => "\xC3\xB0", "\xF1" => "\xC3\xB1", "\xF2" => "\xC3\xB2", "\xF3" => "\xC3\xB3", "\xF4" => "\xC3\xB4", "\xF5" => "\xC3\xB5", "\xF6" => "\xC3\xB6", "\xF7" => "\xC3\xB7", "\xF8" => "\xC3\xB8", "\xF9" => "\xC3\xB9", "\xFA" => "\xC3\xBA", "\xFB" => "\xC3\xBB", "\xFC" => "\xC3\xBC", "\xFD" => "\xC3\xBD", "\xFE" => "\xC3\xBE", "\xFF" => "\xC3\xBF");
-
-               return strtr($string, $convert_table);
-       }
-
-       /**
-        * Change a string from one encoding to another
-        *
-        * @param string $data Raw data in $input encoding
-        * @param string $input Encoding of $data
-        * @param string $output Encoding you want
-        * @return string|boolean False if we can't convert it
-        */
-       public static function change_encoding($data, $input, $output)
-       {
-               $input = SimplePie_Misc::encoding($input);
-               $output = SimplePie_Misc::encoding($output);
-
-               // We fail to fail on non US-ASCII bytes
-               if ($input === 'US-ASCII')
-               {
-                       static $non_ascii_octects = '';
-                       if (!$non_ascii_octects)
-                       {
-                               for ($i = 0x80; $i <= 0xFF; $i++)
-                               {
-                                       $non_ascii_octects .= chr($i);
-                               }
-                       }
-                       $data = substr($data, 0, strcspn($data, $non_ascii_octects));
-               }
-
-               // This is first, as behaviour of this is completely predictable
-               if ($input === 'windows-1252' && $output === 'UTF-8')
-               {
-                       return SimplePie_Misc::windows_1252_to_utf8($data);
-               }
-               // This is second, as behaviour of this varies only with PHP version (the middle part of this expression checks the encoding is supported).
-               elseif (function_exists('mb_convert_encoding') && ($return = SimplePie_Misc::change_encoding_mbstring($data, $input, $output)))
-               {
-                       return $return;
-               }
-               // This is third, as behaviour of this varies with OS userland and PHP version
-               elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output)))
-               {
-                       return $return;
-               }
-               // This is last, as behaviour of this varies with OS userland and PHP version
-               elseif (class_exists('\UConverter') && ($return = SimplePie_Misc::change_encoding_uconverter($data, $input, $output)))
-               {
-                       return $return;
-               }
-
-               // If we can't do anything, just fail
-               return false;
-       }
-
-       protected static function change_encoding_mbstring($data, $input, $output)
-       {
-               if ($input === 'windows-949')
-               {
-                       $input = 'EUC-KR';
-               }
-               if ($output === 'windows-949')
-               {
-                       $output = 'EUC-KR';
-               }
-               if ($input === 'Windows-31J')
-               {
-                       $input = 'SJIS';
-               }
-               if ($output === 'Windows-31J')
-               {
-                       $output = 'SJIS';
-               }
-
-               // Check that the encoding is supported
-               if (!in_array($input, mb_list_encodings()))
-               {
-                       return false;
-               }
-
-               if (@mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80")
-               {
-                       return false;
-               }
-
-               // Let's do some conversion
-               if ($return = @mb_convert_encoding($data, $output, $input))
-               {
-                       return $return;
-               }
-
-               return false;
-       }
-
-       protected static function change_encoding_iconv($data, $input, $output)
-       {
-               return @iconv($input, $output, $data);
-       }
-
-       /**
-        * @param string $data
-        * @param string $input
-        * @param string $output
-        * @return string|false
-        */
-       protected static function change_encoding_uconverter($data, $input, $output)
-       {
-               return @\UConverter::transcode($data, $output, $input);
-       }
-
-       /**
-        * Normalize an encoding name
-        *
-        * This is automatically generated by create.php
-        *
-        * To generate it, run `php create.php` on the command line, and copy the
-        * output to replace this function.
-        *
-        * @param string $charset Character set to standardise
-        * @return string Standardised name
-        */
-       public static function encoding($charset)
-       {
-               // Normalization from UTS #22
-               switch (strtolower(preg_replace('/(?:[^a-zA-Z0-9]+|([^0-9])0+)/', '\1', $charset)))
-               {
-                       case 'adobestandardencoding':
-                       case 'csadobestandardencoding':
-                               return 'Adobe-Standard-Encoding';
-
-                       case 'adobesymbolencoding':
-                       case 'cshppsmath':
-                               return 'Adobe-Symbol-Encoding';
-
-                       case 'ami1251':
-                       case 'amiga1251':
-                               return 'Amiga-1251';
-
-                       case 'ansix31101983':
-                       case 'csat5001983':
-                       case 'csiso99naplps':
-                       case 'isoir99':
-                       case 'naplps':
-                               return 'ANSI_X3.110-1983';
-
-                       case 'arabic7':
-                       case 'asmo449':
-                       case 'csiso89asmo449':
-                       case 'iso9036':
-                       case 'isoir89':
-                               return 'ASMO_449';
-
-                       case 'big5':
-                       case 'csbig5':
-                               return 'Big5';
-
-                       case 'big5hkscs':
-                               return 'Big5-HKSCS';
-
-                       case 'bocu1':
-                       case 'csbocu1':
-                               return 'BOCU-1';
-
-                       case 'brf':
-                       case 'csbrf':
-                               return 'BRF';
-
-                       case 'bs4730':
-                       case 'csiso4unitedkingdom':
-                       case 'gb':
-                       case 'iso646gb':
-                       case 'isoir4':
-                       case 'uk':
-                               return 'BS_4730';
-
-                       case 'bsviewdata':
-                       case 'csiso47bsviewdata':
-                       case 'isoir47':
-                               return 'BS_viewdata';
-
-                       case 'cesu8':
-                       case 'cscesu8':
-                               return 'CESU-8';
-
-                       case 'ca':
-                       case 'csa71':
-                       case 'csaz243419851':
-                       case 'csiso121canadian1':
-                       case 'iso646ca':
-                       case 'isoir121':
-                               return 'CSA_Z243.4-1985-1';
-
-                       case 'csa72':
-                       case 'csaz243419852':
-                       case 'csiso122canadian2':
-                       case 'iso646ca2':
-                       case 'isoir122':
-                               return 'CSA_Z243.4-1985-2';
-
-                       case 'csaz24341985gr':
-                       case 'csiso123csaz24341985gr':
-                       case 'isoir123':
-                               return 'CSA_Z243.4-1985-gr';
-
-                       case 'csiso139csn369103':
-                       case 'csn369103':
-                       case 'isoir139':
-                               return 'CSN_369103';
-
-                       case 'csdecmcs':
-                       case 'dec':
-                       case 'decmcs':
-                               return 'DEC-MCS';
-
-                       case 'csiso21german':
-                       case 'de':
-                       case 'din66003':
-                       case 'iso646de':
-                       case 'isoir21':
-                               return 'DIN_66003';
-
-                       case 'csdkus':
-                       case 'dkus':
-                               return 'dk-us';
-
-                       case 'csiso646danish':
-                       case 'dk':
-                       case 'ds2089':
-                       case 'iso646dk':
-                               return 'DS_2089';
-
-                       case 'csibmebcdicatde':
-                       case 'ebcdicatde':
-                               return 'EBCDIC-AT-DE';
-
-                       case 'csebcdicatdea':
-                       case 'ebcdicatdea':
-                               return 'EBCDIC-AT-DE-A';
-
-                       case 'csebcdiccafr':
-                       case 'ebcdiccafr':
-                               return 'EBCDIC-CA-FR';
-
-                       case 'csebcdicdkno':
-                       case 'ebcdicdkno':
-                               return 'EBCDIC-DK-NO';
-
-                       case 'csebcdicdknoa':
-                       case 'ebcdicdknoa':
-                               return 'EBCDIC-DK-NO-A';
-
-                       case 'csebcdices':
-                       case 'ebcdices':
-                               return 'EBCDIC-ES';
-
-                       case 'csebcdicesa':
-                       case 'ebcdicesa':
-                               return 'EBCDIC-ES-A';
-
-                       case 'csebcdicess':
-                       case 'ebcdicess':
-                               return 'EBCDIC-ES-S';
-
-                       case 'csebcdicfise':
-                       case 'ebcdicfise':
-                               return 'EBCDIC-FI-SE';
-
-                       case 'csebcdicfisea':
-                       case 'ebcdicfisea':
-                               return 'EBCDIC-FI-SE-A';
-
-                       case 'csebcdicfr':
-                       case 'ebcdicfr':
-                               return 'EBCDIC-FR';
-
-                       case 'csebcdicit':
-                       case 'ebcdicit':
-                               return 'EBCDIC-IT';
-
-                       case 'csebcdicpt':
-                       case 'ebcdicpt':
-                               return 'EBCDIC-PT';
-
-                       case 'csebcdicuk':
-                       case 'ebcdicuk':
-                               return 'EBCDIC-UK';
-
-                       case 'csebcdicus':
-                       case 'ebcdicus':
-                               return 'EBCDIC-US';
-
-                       case 'csiso111ecmacyrillic':
-                       case 'ecmacyrillic':
-                       case 'isoir111':
-                       case 'koi8e':
-                               return 'ECMA-cyrillic';
-
-                       case 'csiso17spanish':
-                       case 'es':
-                       case 'iso646es':
-                       case 'isoir17':
-                               return 'ES';
-
-                       case 'csiso85spanish2':
-                       case 'es2':
-                       case 'iso646es2':
-                       case 'isoir85':
-                               return 'ES2';
-
-                       case 'cseucpkdfmtjapanese':
-                       case 'eucjp':
-                       case 'extendedunixcodepackedformatforjapanese':
-                               return 'EUC-JP';
-
-                       case 'cseucfixwidjapanese':
-                       case 'extendedunixcodefixedwidthforjapanese':
-                               return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
-
-                       case 'gb18030':
-                               return 'GB18030';
-
-                       case 'chinese':
-                       case 'cp936':
-                       case 'csgb2312':
-                       case 'csiso58gb231280':
-                       case 'gb2312':
-                       case 'gb231280':
-                       case 'gbk':
-                       case 'isoir58':
-                       case 'ms936':
-                       case 'windows936':
-                               return 'GBK';
-
-                       case 'cn':
-                       case 'csiso57gb1988':
-                       case 'gb198880':
-                       case 'iso646cn':
-                       case 'isoir57':
-                               return 'GB_1988-80';
-
-                       case 'csiso153gost1976874':
-                       case 'gost1976874':
-                       case 'isoir153':
-                       case 'stsev35888':
-                               return 'GOST_19768-74';
-
-                       case 'csiso150':
-                       case 'csiso150greekccitt':
-                       case 'greekccitt':
-                       case 'isoir150':
-                               return 'greek-ccitt';
-
-                       case 'csiso88greek7':
-                       case 'greek7':
-                       case 'isoir88':
-                               return 'greek7';
-
-                       case 'csiso18greek7old':
-                       case 'greek7old':
-                       case 'isoir18':
-                               return 'greek7-old';
-
-                       case 'cshpdesktop':
-                       case 'hpdesktop':
-                               return 'HP-DeskTop';
-
-                       case 'cshplegal':
-                       case 'hplegal':
-                               return 'HP-Legal';
-
-                       case 'cshpmath8':
-                       case 'hpmath8':
-                               return 'HP-Math8';
-
-                       case 'cshppifont':
-                       case 'hppifont':
-                               return 'HP-Pi-font';
-
-                       case 'cshproman8':
-                       case 'hproman8':
-                       case 'r8':
-                       case 'roman8':
-                               return 'hp-roman8';
-
-                       case 'hzgb2312':
-                               return 'HZ-GB-2312';
-
-                       case 'csibmsymbols':
-                       case 'ibmsymbols':
-                               return 'IBM-Symbols';
-
-                       case 'csibmthai':
-                       case 'ibmthai':
-                               return 'IBM-Thai';
-
-                       case 'cp37':
-                       case 'csibm37':
-                       case 'ebcdiccpca':
-                       case 'ebcdiccpnl':
-                       case 'ebcdiccpus':
-                       case 'ebcdiccpwt':
-                       case 'ibm37':
-                               return 'IBM037';
-
-                       case 'cp38':
-                       case 'csibm38':
-                       case 'ebcdicint':
-                       case 'ibm38':
-                               return 'IBM038';
-
-                       case 'cp273':
-                       case 'csibm273':
-                       case 'ibm273':
-                               return 'IBM273';
-
-                       case 'cp274':
-                       case 'csibm274':
-                       case 'ebcdicbe':
-                       case 'ibm274':
-                               return 'IBM274';
-
-                       case 'cp275':
-                       case 'csibm275':
-                       case 'ebcdicbr':
-                       case 'ibm275':
-                               return 'IBM275';
-
-                       case 'csibm277':
-                       case 'ebcdiccpdk':
-                       case 'ebcdiccpno':
-                       case 'ibm277':
-                               return 'IBM277';
-
-                       case 'cp278':
-                       case 'csibm278':
-                       case 'ebcdiccpfi':
-                       case 'ebcdiccpse':
-                       case 'ibm278':
-                               return 'IBM278';
-
-                       case 'cp280':
-                       case 'csibm280':
-                       case 'ebcdiccpit':
-                       case 'ibm280':
-                               return 'IBM280';
-
-                       case 'cp281':
-                       case 'csibm281':
-                       case 'ebcdicjpe':
-                       case 'ibm281':
-                               return 'IBM281';
-
-                       case 'cp284':
-                       case 'csibm284':
-                       case 'ebcdiccpes':
-                       case 'ibm284':
-                               return 'IBM284';
-
-                       case 'cp285':
-                       case 'csibm285':
-                       case 'ebcdiccpgb':
-                       case 'ibm285':
-                               return 'IBM285';
-
-                       case 'cp290':
-                       case 'csibm290':
-                       case 'ebcdicjpkana':
-                       case 'ibm290':
-                               return 'IBM290';
-
-                       case 'cp297':
-                       case 'csibm297':
-                       case 'ebcdiccpfr':
-                       case 'ibm297':
-                               return 'IBM297';
-
-                       case 'cp420':
-                       case 'csibm420':
-                       case 'ebcdiccpar1':
-                       case 'ibm420':
-                               return 'IBM420';
-
-                       case 'cp423':
-                       case 'csibm423':
-                       case 'ebcdiccpgr':
-                       case 'ibm423':
-                               return 'IBM423';
-
-                       case 'cp424':
-                       case 'csibm424':
-                       case 'ebcdiccphe':
-                       case 'ibm424':
-                               return 'IBM424';
-
-                       case '437':
-                       case 'cp437':
-                       case 'cspc8codepage437':
-                       case 'ibm437':
-                               return 'IBM437';
-
-                       case 'cp500':
-                       case 'csibm500':
-                       case 'ebcdiccpbe':
-                       case 'ebcdiccpch':
-                       case 'ibm500':
-                               return 'IBM500';
-
-                       case 'cp775':
-                       case 'cspc775baltic':
-                       case 'ibm775':
-                               return 'IBM775';
-
-                       case '850':
-                       case 'cp850':
-                       case 'cspc850multilingual':
-                       case 'ibm850':
-                               return 'IBM850';
-
-                       case '851':
-                       case 'cp851':
-                       case 'csibm851':
-                       case 'ibm851':
-                               return 'IBM851';
-
-                       case '852':
-                       case 'cp852':
-                       case 'cspcp852':
-                       case 'ibm852':
-                               return 'IBM852';
-
-                       case '855':
-                       case 'cp855':
-                       case 'csibm855':
-                       case 'ibm855':
-                               return 'IBM855';
-
-                       case '857':
-                       case 'cp857':
-                       case 'csibm857':
-                       case 'ibm857':
-                               return 'IBM857';
-
-                       case 'ccsid858':
-                       case 'cp858':
-                       case 'ibm858':
-                       case 'pcmultilingual850euro':
-                               return 'IBM00858';
-
-                       case '860':
-                       case 'cp860':
-                       case 'csibm860':
-                       case 'ibm860':
-                               return 'IBM860';
-
-                       case '861':
-                       case 'cp861':
-                       case 'cpis':
-                       case 'csibm861':
-                       case 'ibm861':
-                               return 'IBM861';
-
-                       case '862':
-                       case 'cp862':
-                       case 'cspc862latinhebrew':
-                       case 'ibm862':
-                               return 'IBM862';
-
-                       case '863':
-                       case 'cp863':
-                       case 'csibm863':
-                       case 'ibm863':
-                               return 'IBM863';
-
-                       case 'cp864':
-                       case 'csibm864':
-                       case 'ibm864':
-                               return 'IBM864';
-
-                       case '865':
-                       case 'cp865':
-                       case 'csibm865':
-                       case 'ibm865':
-                               return 'IBM865';
-
-                       case '866':
-                       case 'cp866':
-                       case 'csibm866':
-                       case 'ibm866':
-                               return 'IBM866';
-
-                       case 'cp868':
-                       case 'cpar':
-                       case 'csibm868':
-                       case 'ibm868':
-                               return 'IBM868';
-
-                       case '869':
-                       case 'cp869':
-                       case 'cpgr':
-                       case 'csibm869':
-                       case 'ibm869':
-                               return 'IBM869';
-
-                       case 'cp870':
-                       case 'csibm870':
-                       case 'ebcdiccproece':
-                       case 'ebcdiccpyu':
-                       case 'ibm870':
-                               return 'IBM870';
-
-                       case 'cp871':
-                       case 'csibm871':
-                       case 'ebcdiccpis':
-                       case 'ibm871':
-                               return 'IBM871';
-
-                       case 'cp880':
-                       case 'csibm880':
-                       case 'ebcdiccyrillic':
-                       case 'ibm880':
-                               return 'IBM880';
-
-                       case 'cp891':
-                       case 'csibm891':
-                       case 'ibm891':
-                               return 'IBM891';
-
-                       case 'cp903':
-                       case 'csibm903':
-                       case 'ibm903':
-                               return 'IBM903';
-
-                       case '904':
-                       case 'cp904':
-                       case 'csibbm904':
-                       case 'ibm904':
-                               return 'IBM904';
-
-                       case 'cp905':
-                       case 'csibm905':
-                       case 'ebcdiccptr':
-                       case 'ibm905':
-                               return 'IBM905';
-
-                       case 'cp918':
-                       case 'csibm918':
-                       case 'ebcdiccpar2':
-                       case 'ibm918':
-                               return 'IBM918';
-
-                       case 'ccsid924':
-                       case 'cp924':
-                       case 'ebcdiclatin9euro':
-                       case 'ibm924':
-                               return 'IBM00924';
-
-                       case 'cp1026':
-                       case 'csibm1026':
-                       case 'ibm1026':
-                               return 'IBM1026';
-
-                       case 'ibm1047':
-                               return 'IBM1047';
-
-                       case 'ccsid1140':
-                       case 'cp1140':
-                       case 'ebcdicus37euro':
-                       case 'ibm1140':
-                               return 'IBM01140';
-
-                       case 'ccsid1141':
-                       case 'cp1141':
-                       case 'ebcdicde273euro':
-                       case 'ibm1141':
-                               return 'IBM01141';
-
-                       case 'ccsid1142':
-                       case 'cp1142':
-                       case 'ebcdicdk277euro':
-                       case 'ebcdicno277euro':
-                       case 'ibm1142':
-                               return 'IBM01142';
-
-                       case 'ccsid1143':
-                       case 'cp1143':
-                       case 'ebcdicfi278euro':
-                       case 'ebcdicse278euro':
-                       case 'ibm1143':
-                               return 'IBM01143';
-
-                       case 'ccsid1144':
-                       case 'cp1144':
-                       case 'ebcdicit280euro':
-                       case 'ibm1144':
-                               return 'IBM01144';
-
-                       case 'ccsid1145':
-                       case 'cp1145':
-                       case 'ebcdices284euro':
-                       case 'ibm1145':
-                               return 'IBM01145';
-
-                       case 'ccsid1146':
-                       case 'cp1146':
-                       case 'ebcdicgb285euro':
-                       case 'ibm1146':
-                               return 'IBM01146';
-
-                       case 'ccsid1147':
-                       case 'cp1147':
-                       case 'ebcdicfr297euro':
-                       case 'ibm1147':
-                               return 'IBM01147';
-
-                       case 'ccsid1148':
-                       case 'cp1148':
-                       case 'ebcdicinternational500euro':
-                       case 'ibm1148':
-                               return 'IBM01148';
-
-                       case 'ccsid1149':
-                       case 'cp1149':
-                       case 'ebcdicis871euro':
-                       case 'ibm1149':
-                               return 'IBM01149';
-
-                       case 'csiso143iecp271':
-                       case 'iecp271':
-                       case 'isoir143':
-                               return 'IEC_P27-1';
-
-                       case 'csiso49inis':
-                       case 'inis':
-                       case 'isoir49':
-                               return 'INIS';
-
-                       case 'csiso50inis8':
-                       case 'inis8':
-                       case 'isoir50':
-                               return 'INIS-8';
-
-                       case 'csiso51iniscyrillic':
-                       case 'iniscyrillic':
-                       case 'isoir51':
-                               return 'INIS-cyrillic';
-
-                       case 'csinvariant':
-                       case 'invariant':
-                               return 'INVARIANT';
-
-                       case 'iso2022cn':
-                               return 'ISO-2022-CN';
-
-                       case 'iso2022cnext':
-                               return 'ISO-2022-CN-EXT';
-
-                       case 'csiso2022jp':
-                       case 'iso2022jp':
-                               return 'ISO-2022-JP';
-
-                       case 'csiso2022jp2':
-                       case 'iso2022jp2':
-                               return 'ISO-2022-JP-2';
-
-                       case 'csiso2022kr':
-                       case 'iso2022kr':
-                               return 'ISO-2022-KR';
-
-                       case 'cswindows30latin1':
-                       case 'iso88591windows30latin1':
-                               return 'ISO-8859-1-Windows-3.0-Latin-1';
-
-                       case 'cswindows31latin1':
-                       case 'iso88591windows31latin1':
-                               return 'ISO-8859-1-Windows-3.1-Latin-1';
-
-                       case 'csisolatin2':
-                       case 'iso88592':
-                       case 'iso885921987':
-                       case 'isoir101':
-                       case 'l2':
-                       case 'latin2':
-                               return 'ISO-8859-2';
-
-                       case 'cswindows31latin2':
-                       case 'iso88592windowslatin2':
-                               return 'ISO-8859-2-Windows-Latin-2';
-
-                       case 'csisolatin3':
-                       case 'iso88593':
-                       case 'iso885931988':
-                       case 'isoir109':
-                       case 'l3':
-                       case 'latin3':
-                               return 'ISO-8859-3';
-
-                       case 'csisolatin4':
-                       case 'iso88594':
-                       case 'iso885941988':
-                       case 'isoir110':
-                       case 'l4':
-                       case 'latin4':
-                               return 'ISO-8859-4';
-
-                       case 'csisolatincyrillic':
-                       case 'cyrillic':
-                       case 'iso88595':
-                       case 'iso885951988':
-                       case 'isoir144':
-                               return 'ISO-8859-5';
-
-                       case 'arabic':
-                       case 'asmo708':
-                       case 'csisolatinarabic':
-                       case 'ecma114':
-                       case 'iso88596':
-                       case 'iso885961987':
-                       case 'isoir127':
-                               return 'ISO-8859-6';
-
-                       case 'csiso88596e':
-                       case 'iso88596e':
-                               return 'ISO-8859-6-E';
-
-                       case 'csiso88596i':
-                       case 'iso88596i':
-                               return 'ISO-8859-6-I';
-
-                       case 'csisolatingreek':
-                       case 'ecma118':
-                       case 'elot928':
-                       case 'greek':
-                       case 'greek8':
-                       case 'iso88597':
-                       case 'iso885971987':
-                       case 'isoir126':
-                               return 'ISO-8859-7';
-
-                       case 'csisolatinhebrew':
-                       case 'hebrew':
-                       case 'iso88598':
-                       case 'iso885981988':
-                       case 'isoir138':
-                               return 'ISO-8859-8';
-
-                       case 'csiso88598e':
-                       case 'iso88598e':
-                               return 'ISO-8859-8-E';
-
-                       case 'csiso88598i':
-                       case 'iso88598i':
-                               return 'ISO-8859-8-I';
-
-                       case 'cswindows31latin5':
-                       case 'iso88599windowslatin5':
-                               return 'ISO-8859-9-Windows-Latin-5';
-
-                       case 'csisolatin6':
-                       case 'iso885910':
-                       case 'iso8859101992':
-                       case 'isoir157':
-                       case 'l6':
-                       case 'latin6':
-                               return 'ISO-8859-10';
-
-                       case 'iso885913':
-                               return 'ISO-8859-13';
-
-                       case 'iso885914':
-                       case 'iso8859141998':
-                       case 'isoceltic':
-                       case 'isoir199':
-                       case 'l8':
-                       case 'latin8':
-                               return 'ISO-8859-14';
-
-                       case 'iso885915':
-                       case 'latin9':
-                               return 'ISO-8859-15';
-
-                       case 'iso885916':
-                       case 'iso8859162001':
-                       case 'isoir226':
-                       case 'l10':
-                       case 'latin10':
-                               return 'ISO-8859-16';
-
-                       case 'iso10646j1':
-                               return 'ISO-10646-J-1';
-
-                       case 'csunicode':
-                       case 'iso10646ucs2':
-                               return 'ISO-10646-UCS-2';
-
-                       case 'csucs4':
-                       case 'iso10646ucs4':
-                               return 'ISO-10646-UCS-4';
-
-                       case 'csunicodeascii':
-                       case 'iso10646ucsbasic':
-                               return 'ISO-10646-UCS-Basic';
-
-                       case 'csunicodelatin1':
-                       case 'iso10646':
-                       case 'iso10646unicodelatin1':
-                               return 'ISO-10646-Unicode-Latin1';
-
-                       case 'csiso10646utf1':
-                       case 'iso10646utf1':
-                               return 'ISO-10646-UTF-1';
-
-                       case 'csiso115481':
-                       case 'iso115481':
-                       case 'isotr115481':
-                               return 'ISO-11548-1';
-
-                       case 'csiso90':
-                       case 'isoir90':
-                               return 'iso-ir-90';
-
-                       case 'csunicodeibm1261':
-                       case 'isounicodeibm1261':
-                               return 'ISO-Unicode-IBM-1261';
-
-                       case 'csunicodeibm1264':
-                       case 'isounicodeibm1264':
-                               return 'ISO-Unicode-IBM-1264';
-
-                       case 'csunicodeibm1265':
-                       case 'isounicodeibm1265':
-                               return 'ISO-Unicode-IBM-1265';
-
-                       case 'csunicodeibm1268':
-                       case 'isounicodeibm1268':
-                               return 'ISO-Unicode-IBM-1268';
-
-                       case 'csunicodeibm1276':
-                       case 'isounicodeibm1276':
-                               return 'ISO-Unicode-IBM-1276';
-
-                       case 'csiso646basic1983':
-                       case 'iso646basic1983':
-                       case 'ref':
-                               return 'ISO_646.basic:1983';
-
-                       case 'csiso2intlrefversion':
-                       case 'irv':
-                       case 'iso646irv1983':
-                       case 'isoir2':
-                               return 'ISO_646.irv:1983';
-
-                       case 'csiso2033':
-                       case 'e13b':
-                       case 'iso20331983':
-                       case 'isoir98':
-                               return 'ISO_2033-1983';
-
-                       case 'csiso5427cyrillic':
-                       case 'iso5427':
-                       case 'isoir37':
-                               return 'ISO_5427';
-
-                       case 'iso5427cyrillic1981':
-                       case 'iso54271981':
-                       case 'isoir54':
-                               return 'ISO_5427:1981';
-
-                       case 'csiso5428greek':
-                       case 'iso54281980':
-                       case 'isoir55':
-                               return 'ISO_5428:1980';
-
-                       case 'csiso6937add':
-                       case 'iso6937225':
-                       case 'isoir152':
-                               return 'ISO_6937-2-25';
-
-                       case 'csisotextcomm':
-                       case 'iso69372add':
-                       case 'isoir142':
-                               return 'ISO_6937-2-add';
-
-                       case 'csiso8859supp':
-                       case 'iso8859supp':
-                       case 'isoir154':
-                       case 'latin125':
-                               return 'ISO_8859-supp';
-
-                       case 'csiso10367box':
-                       case 'iso10367box':
-                       case 'isoir155':
-                               return 'ISO_10367-box';
-
-                       case 'csiso15italian':
-                       case 'iso646it':
-                       case 'isoir15':
-                       case 'it':
-                               return 'IT';
-
-                       case 'csiso13jisc6220jp':
-                       case 'isoir13':
-                       case 'jisc62201969':
-                       case 'jisc62201969jp':
-                       case 'katakana':
-                       case 'x2017':
-                               return 'JIS_C6220-1969-jp';
-
-                       case 'csiso14jisc6220ro':
-                       case 'iso646jp':
-                       case 'isoir14':
-                       case 'jisc62201969ro':
-                       case 'jp':
-                               return 'JIS_C6220-1969-ro';
-
-                       case 'csiso42jisc62261978':
-                       case 'isoir42':
-                       case 'jisc62261978':
-                               return 'JIS_C6226-1978';
-
-                       case 'csiso87jisx208':
-                       case 'isoir87':
-                       case 'jisc62261983':
-                       case 'jisx2081983':
-                       case 'x208':
-                               return 'JIS_C6226-1983';
-
-                       case 'csiso91jisc62291984a':
-                       case 'isoir91':
-                       case 'jisc62291984a':
-                       case 'jpocra':
-                               return 'JIS_C6229-1984-a';
-
-                       case 'csiso92jisc62991984b':
-                       case 'iso646jpocrb':
-                       case 'isoir92':
-                       case 'jisc62291984b':
-                       case 'jpocrb':
-                               return 'JIS_C6229-1984-b';
-
-                       case 'csiso93jis62291984badd':
-                       case 'isoir93':
-                       case 'jisc62291984badd':
-                       case 'jpocrbadd':
-                               return 'JIS_C6229-1984-b-add';
-
-                       case 'csiso94jis62291984hand':
-                       case 'isoir94':
-                       case 'jisc62291984hand':
-                       case 'jpocrhand':
-                               return 'JIS_C6229-1984-hand';
-
-                       case 'csiso95jis62291984handadd':
-                       case 'isoir95':
-                       case 'jisc62291984handadd':
-                       case 'jpocrhandadd':
-                               return 'JIS_C6229-1984-hand-add';
-
-                       case 'csiso96jisc62291984kana':
-                       case 'isoir96':
-                       case 'jisc62291984kana':
-                               return 'JIS_C6229-1984-kana';
-
-                       case 'csjisencoding':
-                       case 'jisencoding':
-                               return 'JIS_Encoding';
-
-                       case 'cshalfwidthkatakana':
-                       case 'jisx201':
-                       case 'x201':
-                               return 'JIS_X0201';
-
-                       case 'csiso159jisx2121990':
-                       case 'isoir159':
-                       case 'jisx2121990':
-                       case 'x212':
-                               return 'JIS_X0212-1990';
-
-                       case 'csiso141jusib1002':
-                       case 'iso646yu':
-                       case 'isoir141':
-                       case 'js':
-                       case 'jusib1002':
-                       case 'yu':
-                               return 'JUS_I.B1.002';
-
-                       case 'csiso147macedonian':
-                       case 'isoir147':
-                       case 'jusib1003mac':
-                       case 'macedonian':
-                               return 'JUS_I.B1.003-mac';
-
-                       case 'csiso146serbian':
-                       case 'isoir146':
-                       case 'jusib1003serb':
-                       case 'serbian':
-                               return 'JUS_I.B1.003-serb';
-
-                       case 'koi7switched':
-                               return 'KOI7-switched';
-
-                       case 'cskoi8r':
-                       case 'koi8r':
-                               return 'KOI8-R';
-
-                       case 'koi8u':
-                               return 'KOI8-U';
-
-                       case 'csksc5636':
-                       case 'iso646kr':
-                       case 'ksc5636':
-                               return 'KSC5636';
-
-                       case 'cskz1048':
-                       case 'kz1048':
-                       case 'rk1048':
-                       case 'strk10482002':
-                               return 'KZ-1048';
-
-                       case 'csiso19latingreek':
-                       case 'isoir19':
-                       case 'latingreek':
-                               return 'latin-greek';
-
-                       case 'csiso27latingreek1':
-                       case 'isoir27':
-                       case 'latingreek1':
-                               return 'Latin-greek-1';
-
-                       case 'csiso158lap':
-                       case 'isoir158':
-                       case 'lap':
-                       case 'latinlap':
-                               return 'latin-lap';
-
-                       case 'csmacintosh':
-                       case 'mac':
-                       case 'macintosh':
-                               return 'macintosh';
-
-                       case 'csmicrosoftpublishing':
-                       case 'microsoftpublishing':
-                               return 'Microsoft-Publishing';
-
-                       case 'csmnem':
-                       case 'mnem':
-                               return 'MNEM';
-
-                       case 'csmnemonic':
-                       case 'mnemonic':
-                               return 'MNEMONIC';
-
-                       case 'csiso86hungarian':
-                       case 'hu':
-                       case 'iso646hu':
-                       case 'isoir86':
-                       case 'msz77953':
-                               return 'MSZ_7795.3';
-
-                       case 'csnatsdano':
-                       case 'isoir91':
-                       case 'natsdano':
-                               return 'NATS-DANO';
-
-                       case 'csnatsdanoadd':
-                       case 'isoir92':
-                       case 'natsdanoadd':
-                               return 'NATS-DANO-ADD';
-
-                       case 'csnatssefi':
-                       case 'isoir81':
-                       case 'natssefi':
-                               return 'NATS-SEFI';
-
-                       case 'csnatssefiadd':
-                       case 'isoir82':
-                       case 'natssefiadd':
-                               return 'NATS-SEFI-ADD';
-
-                       case 'csiso151cuba':
-                       case 'cuba':
-                       case 'iso646cu':
-                       case 'isoir151':
-                       case 'ncnc1081':
-                               return 'NC_NC00-10:81';
-
-                       case 'csiso69french':
-                       case 'fr':
-                       case 'iso646fr':
-                       case 'isoir69':
-                       case 'nfz62010':
-                               return 'NF_Z_62-010';
-
-                       case 'csiso25french':
-                       case 'iso646fr1':
-                       case 'isoir25':
-                       case 'nfz620101973':
-                               return 'NF_Z_62-010_(1973)';
-
-                       case 'csiso60danishnorwegian':
-                       case 'csiso60norwegian1':
-                       case 'iso646no':
-                       case 'isoir60':
-                       case 'no':
-                       case 'ns45511':
-                               return 'NS_4551-1';
-
-                       case 'csiso61norwegian2':
-                       case 'iso646no2':
-                       case 'isoir61':
-                       case 'no2':
-                       case 'ns45512':
-                               return 'NS_4551-2';
-
-                       case 'osdebcdicdf3irv':
-                               return 'OSD_EBCDIC_DF03_IRV';
-
-                       case 'osdebcdicdf41':
-                               return 'OSD_EBCDIC_DF04_1';
-
-                       case 'osdebcdicdf415':
-                               return 'OSD_EBCDIC_DF04_15';
-
-                       case 'cspc8danishnorwegian':
-                       case 'pc8danishnorwegian':
-                               return 'PC8-Danish-Norwegian';
-
-                       case 'cspc8turkish':
-                       case 'pc8turkish':
-                               return 'PC8-Turkish';
-
-                       case 'csiso16portuguese':
-                       case 'iso646pt':
-                       case 'isoir16':
-                       case 'pt':
-                               return 'PT';
-
-                       case 'csiso84portuguese2':
-                       case 'iso646pt2':
-                       case 'isoir84':
-                       case 'pt2':
-                               return 'PT2';
-
-                       case 'cp154':
-                       case 'csptcp154':
-                       case 'cyrillicasian':
-                       case 'pt154':
-                       case 'ptcp154':
-                               return 'PTCP154';
-
-                       case 'scsu':
-                               return 'SCSU';
-
-                       case 'csiso10swedish':
-                       case 'fi':
-                       case 'iso646fi':
-                       case 'iso646se':
-                       case 'isoir10':
-                       case 'se':
-                       case 'sen850200b':
-                               return 'SEN_850200_B';
-
-                       case 'csiso11swedishfornames':
-                       case 'iso646se2':
-                       case 'isoir11':
-                       case 'se2':
-                       case 'sen850200c':
-                               return 'SEN_850200_C';
-
-                       case 'csiso102t617bit':
-                       case 'isoir102':
-                       case 't617bit':
-                               return 'T.61-7bit';
-
-                       case 'csiso103t618bit':
-                       case 'isoir103':
-                       case 't61':
-                       case 't618bit':
-                               return 'T.61-8bit';
-
-                       case 'csiso128t101g2':
-                       case 'isoir128':
-                       case 't101g2':
-                               return 'T.101-G2';
-
-                       case 'cstscii':
-                       case 'tscii':
-                               return 'TSCII';
-
-                       case 'csunicode11':
-                       case 'unicode11':
-                               return 'UNICODE-1-1';
-
-                       case 'csunicode11utf7':
-                       case 'unicode11utf7':
-                               return 'UNICODE-1-1-UTF-7';
-
-                       case 'csunknown8bit':
-                       case 'unknown8bit':
-                               return 'UNKNOWN-8BIT';
-
-                       case 'ansix341968':
-                       case 'ansix341986':
-                       case 'ascii':
-                       case 'cp367':
-                       case 'csascii':
-                       case 'ibm367':
-                       case 'iso646irv1991':
-                       case 'iso646us':
-                       case 'isoir6':
-                       case 'us':
-                       case 'usascii':
-                               return 'US-ASCII';
-
-                       case 'csusdk':
-                       case 'usdk':
-                               return 'us-dk';
-
-                       case 'utf7':
-                               return 'UTF-7';
-
-                       case 'utf8':
-                               return 'UTF-8';
-
-                       case 'utf16':
-                               return 'UTF-16';
-
-                       case 'utf16be':
-                               return 'UTF-16BE';
-
-                       case 'utf16le':
-                               return 'UTF-16LE';
-
-                       case 'utf32':
-                               return 'UTF-32';
-
-                       case 'utf32be':
-                               return 'UTF-32BE';
-
-                       case 'utf32le':
-                               return 'UTF-32LE';
-
-                       case 'csventurainternational':
-                       case 'venturainternational':
-                               return 'Ventura-International';
-
-                       case 'csventuramath':
-                       case 'venturamath':
-                               return 'Ventura-Math';
-
-                       case 'csventuraus':
-                       case 'venturaus':
-                               return 'Ventura-US';
-
-                       case 'csiso70videotexsupp1':
-                       case 'isoir70':
-                       case 'videotexsuppl':
-                               return 'videotex-suppl';
-
-                       case 'csviqr':
-                       case 'viqr':
-                               return 'VIQR';
-
-                       case 'csviscii':
-                       case 'viscii':
-                               return 'VISCII';
-
-                       case 'csshiftjis':
-                       case 'cswindows31j':
-                       case 'mskanji':
-                       case 'shiftjis':
-                       case 'windows31j':
-                               return 'Windows-31J';
-
-                       case 'iso885911':
-                       case 'tis620':
-                               return 'windows-874';
-
-                       case 'cseuckr':
-                       case 'csksc56011987':
-                       case 'euckr':
-                       case 'isoir149':
-                       case 'korean':
-                       case 'ksc5601':
-                       case 'ksc56011987':
-                       case 'ksc56011989':
-                       case 'windows949':
-                               return 'windows-949';
-
-                       case 'windows1250':
-                               return 'windows-1250';
-
-                       case 'windows1251':
-                               return 'windows-1251';
-
-                       case 'cp819':
-                       case 'csisolatin1':
-                       case 'ibm819':
-                       case 'iso88591':
-                       case 'iso885911987':
-                       case 'isoir100':
-                       case 'l1':
-                       case 'latin1':
-                       case 'windows1252':
-                               return 'windows-1252';
-
-                       case 'windows1253':
-                               return 'windows-1253';
-
-                       case 'csisolatin5':
-                       case 'iso88599':
-                       case 'iso885991989':
-                       case 'isoir148':
-                       case 'l5':
-                       case 'latin5':
-                       case 'windows1254':
-                               return 'windows-1254';
-
-                       case 'windows1255':
-                               return 'windows-1255';
-
-                       case 'windows1256':
-                               return 'windows-1256';
-
-                       case 'windows1257':
-                               return 'windows-1257';
-
-                       case 'windows1258':
-                               return 'windows-1258';
-
-                       default:
-                               return $charset;
-               }
-       }
-
-       public static function get_curl_version()
-       {
-               if (is_array($curl = curl_version()))
-               {
-                       $curl = $curl['version'];
-               }
-               elseif (substr($curl, 0, 5) === 'curl/')
-               {
-                       $curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
-               }
-               elseif (substr($curl, 0, 8) === 'libcurl/')
-               {
-                       $curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
-               }
-               else
-               {
-                       $curl = 0;
-               }
-               return $curl;
-       }
-
-       /**
-        * Strip HTML comments
-        *
-        * @param string $data Data to strip comments from
-        * @return string Comment stripped string
-        */
-       public static function strip_comments($data)
-       {
-               $output = '';
-               while (($start = strpos($data, '<!--')) !== false)
-               {
-                       $output .= substr($data, 0, $start);
-                       if (($end = strpos($data, '-->', $start)) !== false)
-                       {
-                               $data = substr_replace($data, '', 0, $end + 3);
-                       }
-                       else
-                       {
-                               $data = '';
-                       }
-               }
-               return $output . $data;
-       }
-
-       public static function parse_date($dt)
-       {
-               $parser = SimplePie_Parse_Date::get();
-               return $parser->parse($dt);
-       }
-
-       /**
-        * Decode HTML entities
-        *
-        * @deprecated Use DOMDocument instead
-        * @param string $data Input data
-        * @return string Output data
-        */
-       public static function entities_decode($data)
-       {
-               $decoder = new SimplePie_Decode_HTML_Entities($data);
-               return $decoder->parse();
-       }
-
-       /**
-        * Remove RFC822 comments
-        *
-        * @param string $data Data to strip comments from
-        * @return string Comment stripped string
-        */
-       public static function uncomment_rfc822($string)
-       {
-               $string = (string) $string;
-               $position = 0;
-               $length = strlen($string);
-               $depth = 0;
-
-               $output = '';
-
-               while ($position < $length && ($pos = strpos($string, '(', $position)) !== false)
-               {
-                       $output .= substr($string, $position, $pos - $position);
-                       $position = $pos + 1;
-                       if ($string[$pos - 1] !== '\\')
-                       {
-                               $depth++;
-                               while ($depth && $position < $length)
-                               {
-                                       $position += strcspn($string, '()', $position);
-                                       if ($string[$position - 1] === '\\')
-                                       {
-                                               $position++;
-                                               continue;
-                                       }
-                                       elseif (isset($string[$position]))
-                                       {
-                                               switch ($string[$position])
-                                               {
-                                                       case '(':
-                                                               $depth++;
-                                                               break;
-
-                                                       case ')':
-                                                               $depth--;
-                                                               break;
-                                               }
-                                               $position++;
-                                       }
-                                       else
-                                       {
-                                               break;
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               $output .= '(';
-                       }
-               }
-               $output .= substr($string, $position);
-
-               return $output;
-       }
-
-       public static function parse_mime($mime)
-       {
-               if (($pos = strpos($mime, ';')) === false)
-               {
-                       return trim($mime);
-               }
-
-               return trim(substr($mime, 0, $pos));
-       }
-
-       public static function atom_03_construct_type($attribs)
-       {
-               if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64'))
-               {
-                       $mode = SIMPLEPIE_CONSTRUCT_BASE64;
-               }
-               else
-               {
-                       $mode = SIMPLEPIE_CONSTRUCT_NONE;
-               }
-               if (isset($attribs['']['type']))
-               {
-                       switch (strtolower(trim($attribs['']['type'])))
-                       {
-                               case 'text':
-                               case 'text/plain':
-                                       return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
-
-                               case 'html':
-                               case 'text/html':
-                                       return SIMPLEPIE_CONSTRUCT_HTML | $mode;
-
-                               case 'xhtml':
-                               case 'application/xhtml+xml':
-                                       return SIMPLEPIE_CONSTRUCT_XHTML | $mode;
-
-                               default:
-                                       return SIMPLEPIE_CONSTRUCT_NONE | $mode;
-                       }
-               }
-
-               return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
-       }
-
-       public static function atom_10_construct_type($attribs)
-       {
-               if (isset($attribs['']['type']))
-               {
-                       switch (strtolower(trim($attribs['']['type'])))
-                       {
-                               case 'text':
-                                       return SIMPLEPIE_CONSTRUCT_TEXT;
-
-                               case 'html':
-                                       return SIMPLEPIE_CONSTRUCT_HTML;
-
-                               case 'xhtml':
-                                       return SIMPLEPIE_CONSTRUCT_XHTML;
-
-                               default:
-                                       return SIMPLEPIE_CONSTRUCT_NONE;
-                       }
-               }
-               return SIMPLEPIE_CONSTRUCT_TEXT;
-       }
-
-       public static function atom_10_content_construct_type($attribs)
-       {
-               if (isset($attribs['']['type']))
-               {
-                       $type = strtolower(trim($attribs['']['type']));
-                       switch ($type)
-                       {
-                               case 'text':
-                                       return SIMPLEPIE_CONSTRUCT_TEXT;
-
-                               case 'html':
-                                       return SIMPLEPIE_CONSTRUCT_HTML;
-
-                               case 'xhtml':
-                                       return SIMPLEPIE_CONSTRUCT_XHTML;
-                       }
-                       if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) === 'text/')
-                       {
-                               return SIMPLEPIE_CONSTRUCT_NONE;
-                       }
-                       else
-                       {
-                               return SIMPLEPIE_CONSTRUCT_BASE64;
-                       }
-               }
-
-               return SIMPLEPIE_CONSTRUCT_TEXT;
-       }
-
-       public static function is_isegment_nz_nc($string)
-       {
-               return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
-       }
-
-       public static function space_separated_tokens($string)
-       {
-               $space_characters = "\x20\x09\x0A\x0B\x0C\x0D";
-               $string_length = strlen($string);
-
-               $position = strspn($string, $space_characters);
-               $tokens = array();
-
-               while ($position < $string_length)
-               {
-                       $len = strcspn($string, $space_characters, $position);
-                       $tokens[] = substr($string, $position, $len);
-                       $position += $len;
-                       $position += strspn($string, $space_characters, $position);
-               }
-
-               return $tokens;
-       }
-
-       /**
-        * Converts a unicode codepoint to a UTF-8 character
-        *
-        * @static
-        * @param int $codepoint Unicode codepoint
-        * @return string UTF-8 character
-        */
-       public static function codepoint_to_utf8($codepoint)
-       {
-               $codepoint = (int) $codepoint;
-               if ($codepoint < 0)
-               {
-                       return false;
-               }
-               else if ($codepoint <= 0x7f)
-               {
-                       return chr($codepoint);
-               }
-               else if ($codepoint <= 0x7ff)
-               {
-                       return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
-               }
-               else if ($codepoint <= 0xffff)
-               {
-                       return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
-               }
-               else if ($codepoint <= 0x10ffff)
-               {
-                       return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
-               }
-
-               // U+FFFD REPLACEMENT CHARACTER
-               return "\xEF\xBF\xBD";
-       }
-
-       /**
-        * Similar to parse_str()
-        *
-        * Returns an associative array of name/value pairs, where the value is an
-        * array of values that have used the same name
-        *
-        * @static
-        * @param string $str The input string.
-        * @return array
-        */
-       public static function parse_str($str)
-       {
-               $return = array();
-               $str = explode('&', $str);
-
-               foreach ($str as $section)
-               {
-                       if (strpos($section, '=') !== false)
-                       {
-                               list($name, $value) = explode('=', $section, 2);
-                               $return[urldecode($name)][] = urldecode($value);
-                       }
-                       else
-                       {
-                               $return[urldecode($section)][] = null;
-                       }
-               }
-
-               return $return;
-       }
-
-       /**
-        * Detect XML encoding, as per XML 1.0 Appendix F.1
-        *
-        * @todo Add support for EBCDIC
-        * @param string $data XML data
-        * @param SimplePie_Registry $registry Class registry
-        * @return array Possible encodings
-        */
-       public static function xml_encoding($data, $registry)
-       {
-               // UTF-32 Big Endian BOM
-               if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
-               {
-                       $encoding[] = 'UTF-32BE';
-               }
-               // UTF-32 Little Endian BOM
-               elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00")
-               {
-                       $encoding[] = 'UTF-32LE';
-               }
-               // UTF-16 Big Endian BOM
-               elseif (substr($data, 0, 2) === "\xFE\xFF")
-               {
-                       $encoding[] = 'UTF-16BE';
-               }
-               // UTF-16 Little Endian BOM
-               elseif (substr($data, 0, 2) === "\xFF\xFE")
-               {
-                       $encoding[] = 'UTF-16LE';
-               }
-               // UTF-8 BOM
-               elseif (substr($data, 0, 3) === "\xEF\xBB\xBF")
-               {
-                       $encoding[] = 'UTF-8';
-               }
-               // UTF-32 Big Endian Without BOM
-               elseif (substr($data, 0, 20) === "\x00\x00\x00\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C")
-               {
-                       if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E"))
-                       {
-                               $parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8')));
-                               if ($parser->parse())
-                               {
-                                       $encoding[] = $parser->encoding;
-                               }
-                       }
-                       $encoding[] = 'UTF-32BE';
-               }
-               // UTF-32 Little Endian Without BOM
-               elseif (substr($data, 0, 20) === "\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C\x00\x00\x00")
-               {
-                       if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00"))
-                       {
-                               $parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8')));
-                               if ($parser->parse())
-                               {
-                                       $encoding[] = $parser->encoding;
-                               }
-                       }
-                       $encoding[] = 'UTF-32LE';
-               }
-               // UTF-16 Big Endian Without BOM
-               elseif (substr($data, 0, 10) === "\x00\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C")
-               {
-                       if ($pos = strpos($data, "\x00\x3F\x00\x3E"))
-                       {
-                               $parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8')));
-                               if ($parser->parse())
-                               {
-                                       $encoding[] = $parser->encoding;
-                               }
-                       }
-                       $encoding[] = 'UTF-16BE';
-               }
-               // UTF-16 Little Endian Without BOM
-               elseif (substr($data, 0, 10) === "\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C\x00")
-               {
-                       if ($pos = strpos($data, "\x3F\x00\x3E\x00"))
-                       {
-                               $parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8')));
-                               if ($parser->parse())
-                               {
-                                       $encoding[] = $parser->encoding;
-                               }
-                       }
-                       $encoding[] = 'UTF-16LE';
-               }
-               // US-ASCII (or superset)
-               elseif (substr($data, 0, 5) === "\x3C\x3F\x78\x6D\x6C")
-               {
-                       if ($pos = strpos($data, "\x3F\x3E"))
-                       {
-                               $parser = $registry->create('XML_Declaration_Parser', array(substr($data, 5, $pos - 5)));
-                               if ($parser->parse())
-                               {
-                                       $encoding[] = $parser->encoding;
-                               }
-                       }
-                       $encoding[] = 'UTF-8';
-               }
-               // Fallback to UTF-8
-               else
-               {
-                       $encoding[] = 'UTF-8';
-               }
-               return $encoding;
-       }
-
-       public static function output_javascript()
-       {
-               if (function_exists('ob_gzhandler'))
-               {
-                       ob_start('ob_gzhandler');
-               }
-               header('Content-type: text/javascript; charset: UTF-8');
-               header('Cache-Control: must-revalidate');
-               header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
-               ?>
-function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
-       if (placeholder != '') {
-               document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
-       }
-       else {
-               document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" src="'+link+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="true" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
-       }
-}
-
-function embed_flash(bgcolor, width, height, link, loop, type) {
-       document.writeln('<embed src="'+link+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="'+type+'" quality="high" width="'+width+'" height="'+height+'" bgcolor="'+bgcolor+'" loop="'+loop+'"></embed>');
-}
-
-function embed_flv(width, height, link, placeholder, loop, player) {
-       document.writeln('<embed src="'+player+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="'+width+'" height="'+height+'" wmode="transparent" flashvars="file='+link+'&autostart=false&repeat='+loop+'&showdigits=true&showfsbutton=false"></embed>');
-}
-
-function embed_wmedia(width, height, link) {
-       document.writeln('<embed type="application/x-mplayer2" src="'+link+'" autosize="1" width="'+width+'" height="'+height+'" showcontrols="1" showstatusbar="0" showdisplay="0" autostart="0"></embed>');
-}
-               <?php
-       }
-
-       /**
-        * Get the SimplePie build timestamp
-        *
-        * Uses the git index if it exists, otherwise uses the modification time
-        * of the newest file.
-        */
-       public static function get_build()
-       {
-               $root = dirname(dirname(__FILE__));
-               if (file_exists($root . '/.git/index'))
-               {
-                       return filemtime($root . '/.git/index');
-               }
-               elseif (file_exists($root . '/SimplePie'))
-               {
-                       $time = 0;
-                       foreach (glob($root . '/SimplePie/*.php') as $file)
-                       {
-                               if (($mtime = filemtime($file)) > $time)
-                               {
-                                       $time = $mtime;
-                               }
-                       }
-                       return $time;
-               }
-               elseif (file_exists(dirname(__FILE__) . '/Core.php'))
-               {
-                       return filemtime(dirname(__FILE__) . '/Core.php');
-               }
-
-               return filemtime(__FILE__);
-       }
-
-       /**
-        * Format debugging information
-        */
-       public static function debug(&$sp)
-       {
-               $info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
-               $info .= 'PHP ' . PHP_VERSION . "\n";
-               if ($sp->error() !== null)
-               {
-                       $info .= 'Error occurred: ' . $sp->error() . "\n";
-               }
-               else
-               {
-                       $info .= "No error found.\n";
-               }
-               $info .= "Extensions:\n";
-               $extensions = array('pcre', 'curl', 'zlib', 'mbstring', 'iconv', 'xmlreader', 'xml');
-               foreach ($extensions as $ext)
-               {
-                       if (extension_loaded($ext))
-                       {
-                               $info .= "    $ext loaded\n";
-                               switch ($ext)
-                               {
-                                       case 'pcre':
-                                               $info .= '      Version ' . PCRE_VERSION . "\n";
-                                               break;
-                                       case 'curl':
-                                               $version = curl_version();
-                                               $info .= '      Version ' . $version['version'] . "\n";
-                                               break;
-                                       case 'mbstring':
-                                               $info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
-                                               break;
-                                       case 'iconv':
-                                               $info .= '      Version ' . ICONV_VERSION . "\n";
-                                               break;
-                                       case 'xml':
-                                               $info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
-                                               break;
-                               }
-                       }
-                       else
-                       {
-                               $info .= "    $ext not loaded\n";
-                       }
-               }
-               return $info;
-       }
-
-       public static function silence_errors($num, $str)
-       {
-               // No-op
-       }
-
-       /**
-        * Sanitize a URL by removing HTTP credentials.
-        * @param string $url the URL to sanitize.
-        * @return string the same URL without HTTP credentials.
-        */
-       public static function url_remove_credentials($url)
-       {
-               return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url);
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieParserphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Parser.php        2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Parser.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,679 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Parses XML into something sane
- *
- *
- * This class can be overloaded with {@see SimplePie::set_parser_class()}
- *
- * @package SimplePie
- * @subpackage Parsing
- */
-class SimplePie_Parser
-{
-       var $error_code;
-       var $error_string;
-       var $current_line;
-       var $current_column;
-       var $current_byte;
-       var $separator = ' ';
-       var $namespace = array('');
-       var $element = array('');
-       var $xml_base = array('');
-       var $xml_base_explicit = array(false);
-       var $xml_lang = array('');
-       var $data = array();
-       var $datas = array(array());
-       var $current_xhtml_construct = -1;
-       var $encoding;
-       protected $registry;
-
-       public function set_registry(SimplePie_Registry $registry)
-       {
-               $this->registry = $registry;
-       }
-
-       public function parse(&$data, $encoding, $url = '')
-       {
-               if (class_exists('DOMXpath') && function_exists('Mf2\parse')) {
-                       $doc = new DOMDocument();
-                       @$doc->loadHTML($data);
-                       $xpath = new DOMXpath($doc);
-                       // Check for both h-feed and h-entry, as both a feed with no entries
-                       // and a list of entries without an h-feed wrapper are both valid.
-                       $query = '//*[contains(concat(" ", @class, " "), " h-feed ") or '.
-                               'contains(concat(" ", @class, " "), " h-entry ")]';
-                       $result = $xpath->query($query);
-                       if ($result->length !== 0) {
-                               return $this->parse_microformats($data, $url);
-                       }
-               }
-
-               // Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character
-               if (strtoupper($encoding) === 'US-ASCII')
-               {
-                       $this->encoding = 'UTF-8';
-               }
-               else
-               {
-                       $this->encoding = $encoding;
-               }
-
-               // Strip BOM:
-               // UTF-32 Big Endian BOM
-               if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
-               {
-                       $data = substr($data, 4);
-               }
-               // UTF-32 Little Endian BOM
-               elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00")
-               {
-                       $data = substr($data, 4);
-               }
-               // UTF-16 Big Endian BOM
-               elseif (substr($data, 0, 2) === "\xFE\xFF")
-               {
-                       $data = substr($data, 2);
-               }
-               // UTF-16 Little Endian BOM
-               elseif (substr($data, 0, 2) === "\xFF\xFE")
-               {
-                       $data = substr($data, 2);
-               }
-               // UTF-8 BOM
-               elseif (substr($data, 0, 3) === "\xEF\xBB\xBF")
-               {
-                       $data = substr($data, 3);
-               }
-
-               if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false)
-               {
-                       $declaration = $this->registry->create('XML_Declaration_Parser', array(substr($data, 5, $pos - 5)));
-                       if ($declaration->parse())
-                       {
-                               $data = substr($data, $pos + 2);
-                               $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' ."\n". $this->declare_html_entities() . $data;
-                       }
-                       else
-                       {
-                               $this->error_string = 'SimplePie bug! Please report this!';
-                               return false;
-                       }
-               }
-
-               $return = true;
-
-               static $xml_is_sane = null;
-               if ($xml_is_sane === null)
-               {
-                       $parser_check = xml_parser_create();
-                       xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
-                       xml_parser_free($parser_check);
-                       $xml_is_sane = isset($values[0]['value']);
-               }
-
-               // Create the parser
-               if ($xml_is_sane)
-               {
-                       $xml = xml_parser_create_ns($this->encoding, $this->separator);
-                       xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
-                       xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
-                       xml_set_object($xml, $this);
-                       xml_set_character_data_handler($xml, 'cdata');
-                       xml_set_element_handler($xml, 'tag_open', 'tag_close');
-
-                       // Parse!
-                       $wrapper = @is_writable(sys_get_temp_dir()) ? 'php://temp' : 'php://memory';
-                       if (($stream = fopen($wrapper, 'r+')) &&
-                               fwrite($stream, $data) &&
-                               rewind($stream))
-                       {
-                               //Parse by chunks not to use too much memory
-                               do
-                               {
-                                       $stream_data = fread($stream, 1048576);
-                                       if (!xml_parse($xml, $stream_data === false ? '' : $stream_data, feof($stream)))
-                                       {
-                                               $this->error_code = xml_get_error_code($xml);
-                                               $this->error_string = xml_error_string($this->error_code);
-                                               $return = false;
-                                               break;
-                                       }
-                               } while (!feof($stream));
-                               fclose($stream);
-                       }
-                       else
-                       {
-                               $return = false;
-                       }
-
-                       $this->current_line = xml_get_current_line_number($xml);
-                       $this->current_column = xml_get_current_column_number($xml);
-                       $this->current_byte = xml_get_current_byte_index($xml);
-                       xml_parser_free($xml);
-                       return $return;
-               }
-
-               libxml_clear_errors();
-               $xml = new XMLReader();
-               $xml->xml($data);
-               while (@$xml->read())
-               {
-                       switch ($xml->nodeType)
-                       {
-
-                               case constant('XMLReader::END_ELEMENT'):
-                                       if ($xml->namespaceURI !== '')
-                                       {
-                                               $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-                                       }
-                                       else
-                                       {
-                                               $tagName = $xml->localName;
-                                       }
-                                       $this->tag_close(null, $tagName);
-                                       break;
-                               case constant('XMLReader::ELEMENT'):
-                                       $empty = $xml->isEmptyElement;
-                                       if ($xml->namespaceURI !== '')
-                                       {
-                                               $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-                                       }
-                                       else
-                                       {
-                                               $tagName = $xml->localName;
-                                       }
-                                       $attributes = array();
-                                       while ($xml->moveToNextAttribute())
-                                       {
-                                               if ($xml->namespaceURI !== '')
-                                               {
-                                                       $attrName = $xml->namespaceURI . $this->separator . $xml->localName;
-                                               }
-                                               else
-                                               {
-                                                       $attrName = $xml->localName;
-                                               }
-                                               $attributes[$attrName] = $xml->value;
-                                       }
-                                       $this->tag_open(null, $tagName, $attributes);
-                                       if ($empty)
-                                       {
-                                               $this->tag_close(null, $tagName);
-                                       }
-                                       break;
-                               case constant('XMLReader::TEXT'):
-
-                               case constant('XMLReader::CDATA'):
-                                       $this->cdata(null, $xml->value);
-                                       break;
-                       }
-               }
-               if ($error = libxml_get_last_error())
-               {
-                       $this->error_code = $error->code;
-                       $this->error_string = $error->message;
-                       $this->current_line = $error->line;
-                       $this->current_column = $error->column;
-                       return false;
-               }
-
-               return true;
-       }
-
-       public function get_error_code()
-       {
-               return $this->error_code;
-       }
-
-       public function get_error_string()
-       {
-               return $this->error_string;
-       }
-
-       public function get_current_line()
-       {
-               return $this->current_line;
-       }
-
-       public function get_current_column()
-       {
-               return $this->current_column;
-       }
-
-       public function get_current_byte()
-       {
-               return $this->current_byte;
-       }
-
-       public function get_data()
-       {
-               return $this->data;
-       }
-
-       public function tag_open($parser, $tag, $attributes)
-       {
-               list($this->namespace[], $this->element[]) = $this->split_ns($tag);
-
-               $attribs = array();
-               foreach ($attributes as $name => $value)
-               {
-                       list($attrib_namespace, $attribute) = $this->split_ns($name);
-                       $attribs[$attrib_namespace][$attribute] = $value;
-               }
-
-               if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['base']))
-               {
-                       $base = $this->registry->call('Misc', 'absolutize_url', array($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base)));
-                       if ($base !== false)
-                       {
-                               $this->xml_base[] = $base;
-                               $this->xml_base_explicit[] = true;
-                       }
-               }
-               else
-               {
-                       $this->xml_base[] = end($this->xml_base);
-                       $this->xml_base_explicit[] = end($this->xml_base_explicit);
-               }
-
-               if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
-               {
-                       $this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
-               }
-               else
-               {
-                       $this->xml_lang[] = end($this->xml_lang);
-               }
-
-               if ($this->current_xhtml_construct >= 0)
-               {
-                       $this->current_xhtml_construct++;
-                       if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
-                       {
-                               $this->data['data'] .= '<' . end($this->element);
-                               if (isset($attribs['']))
-                               {
-                                       foreach ($attribs[''] as $name => $value)
-                                       {
-                                               $this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
-                                       }
-                               }
-                               $this->data['data'] .= '>';
-                       }
-               }
-               else
-               {
-                       $this->datas[] =& $this->data;
-                       $this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
-                       $this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
-                       if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
-                       || (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
-                       || (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_20 && in_array(end($this->element), array('title')))
-                       || (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_090 && in_array(end($this->element), array('title')))
-                       || (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_10 && in_array(end($this->element), array('title'))))
-                       {
-                               $this->current_xhtml_construct = 0;
-                       }
-               }
-       }
-
-       public function cdata($parser, $cdata)
-       {
-               if ($this->current_xhtml_construct >= 0)
-               {
-                       $this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
-               }
-               else
-               {
-                       $this->data['data'] .= $cdata;
-               }
-       }
-
-       public function tag_close($parser, $tag)
-       {
-               if ($this->current_xhtml_construct >= 0)
-               {
-                       $this->current_xhtml_construct--;
-                       if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
-                       {
-                               $this->data['data'] .= '</' . end($this->element) . '>';
-                       }
-               }
-               if ($this->current_xhtml_construct === -1)
-               {
-                       $this->data =& $this->datas[count($this->datas) - 1];
-                       array_pop($this->datas);
-               }
-
-               array_pop($this->element);
-               array_pop($this->namespace);
-               array_pop($this->xml_base);
-               array_pop($this->xml_base_explicit);
-               array_pop($this->xml_lang);
-       }
-
-       public function split_ns($string)
-       {
-               static $cache = array();
-               if (!isset($cache[$string]))
-               {
-                       if ($pos = strpos($string, $this->separator))
-                       {
-                               static $separator_length;
-                               if (!$separator_length)
-                               {
-                                       $separator_length = strlen($this->separator);
-                               }
-                               $namespace = substr($string, 0, $pos);
-                               $local_name = substr($string, $pos + $separator_length);
-                               if (strtolower($namespace) === SIMPLEPIE_NAMESPACE_ITUNES)
-                               {
-                                       $namespace = SIMPLEPIE_NAMESPACE_ITUNES;
-                               }
-
-                               // Normalize the Media RSS namespaces
-                               if ($namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG ||
-                                       $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
-                                       $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
-                                       $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
-                                       $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
-                               {
-                                       $namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
-                               }
-                               $cache[$string] = array($namespace, $local_name);
-                       }
-                       else
-                       {
-                               $cache[$string] = array('', $string);
-                       }
-               }
-               return $cache[$string];
-       }
-
-       private function parse_hcard($data, $category = false) {
-               $name = '';
-               $link = '';
-               // Check if h-card is set and pass that information on in the link.
-               if (isset($data['type']) && in_array('h-card', $data['type'])) {
-                       if (isset($data['properties']['name'][0])) {
-                               $name = $data['properties']['name'][0];
-                       }
-                       if (isset($data['properties']['url'][0])) {
-                               $link = $data['properties']['url'][0];
-                               if ($name === '') {
-                                       $name = $link;
-                               }
-                               else {
-                                       // can't have commas in categories.
-                                       $name = str_replace(',', '', $name);
-                               }
-                               $person_tag = $category ? '<span class="person-tag"></span>' : '';
-                               return '<a class="h-card" href="'.$link.'">'.$person_tag.$name.'</a>';
-                       }
-               }
-               return isset($data['value']) ? $data['value'] : '';
-       }
-
-       private function parse_microformats(&$data, $url) {
-               $feed_title = '';
-               $feed_author = NULL;
-               $author_cache = array();
-               $items = array();
-               $entries = array();
-               $mf = Mf2\parse($data, $url);
-               // First look for an h-feed.
-               $h_feed = array();
-               foreach ($mf['items'] as $mf_item) {
-                       if (in_array('h-feed', $mf_item['type'])) {
-                               $h_feed = $mf_item;
-                               break;
-                       }
-                       // Also look for h-feed or h-entry in the children of each top level item.
-                       if (!isset($mf_item['children'][0]['type'])) continue;
-                       if (in_array('h-feed', $mf_item['children'][0]['type'])) {
-                               $h_feed = $mf_item['children'][0];
-                               // In this case the parent of the h-feed may be an h-card, so use it as
-                               // the feed_author.
-                               if (in_array('h-card', $mf_item['type'])) $feed_author = $mf_item;
-                               break;
-                       }
-                       else if (in_array('h-entry', $mf_item['children'][0]['type'])) {
-                               $entries = $mf_item['children'];
-                               // In this case the parent of the h-entry list may be an h-card, so use
-                               // it as the feed_author.
-                               if (in_array('h-card', $mf_item['type'])) $feed_author = $mf_item;
-                               break;
-                       }
-               }
-               if (isset($h_feed['children'])) {
-                       $entries = $h_feed['children'];
-                       // Also set the feed title and store author from the h-feed if available.
-                       if (isset($mf['items'][0]['properties']['name'][0])) {
-                               $feed_title = $mf['items'][0]['properties']['name'][0];
-                       }
-                       if (isset($mf['items'][0]['properties']['author'][0])) {
-                               $feed_author = $mf['items'][0]['properties']['author'][0];
-                       }
-               }
-               else if (count($entries) === 0) {
-                       $entries = $mf['items'];
-               }
-               for ($i = 0; $i < count($entries); $i++) {
-                       $entry = $entries[$i];
-                       if (in_array('h-entry', $entry['type'])) {
-                               $item = array();
-                               $title = '';
-                               $description = '';
-                               if (isset($entry['properties']['url'][0])) {
-                                       $link = $entry['properties']['url'][0];
-                                       if (isset($link['value'])) $link = $link['value'];
-                                       $item['link'] = array(array('data' => $link));
-                               }
-                               if (isset($entry['properties']['uid'][0])) {
-                                       $guid = $entry['properties']['uid'][0];
-                                       if (isset($guid['value'])) $guid = $guid['value'];
-                                       $item['guid'] = array(array('data' => $guid));
-                               }
-                               if (isset($entry['properties']['name'][0])) {
-                                       $title = $entry['properties']['name'][0];
-                                       if (isset($title['value'])) $title = $title['value'];
-                                       $item['title'] = array(array('data' => $title));
-                               }
-                               if (isset($entry['properties']['author'][0]) || isset($feed_author)) {
-                                       // author is a special case, it can be plain text or an h-card array.
-                                       // If it's plain text it can also be a url that should be followed to
-                                       // get the actual h-card.
-                                       $author = isset($entry['properties']['author'][0]) ?
-                                               $entry['properties']['author'][0] : $feed_author;
-                                       if (!is_string($author)) {
-                                               $author = $this->parse_hcard($author);
-                                       }
-                                       else if (strpos($author, 'http') === 0) {
-                                               if (isset($author_cache[$author])) {
-                                                       $author = $author_cache[$author];
-                                               }
-                                               else {
-                                                       $mf = Mf2\fetch($author);
-                                                       foreach ($mf['items'] as $hcard) {
-                                                               // Only interested in an h-card by itself in this case.
-                                                               if (!in_array('h-card', $hcard['type'])) {
-                                                                       continue;
-                                                               }
-                                                               // It must have a url property matching what we fetched.
-                                                               if (!isset($hcard['properties']['url']) ||
-                                                                               !(in_array($author, $hcard['properties']['url']))) {
-                                                                       continue;
-                                                               }
-                                                               // Save parse_hcard the trouble of finding the correct url.
-                                                               $hcard['properties']['url'][0] = $author;
-                                                               // Cache this h-card for the next h-entry to check.
-                                                               $author_cache[$author] = $this->parse_hcard($hcard);
-                                                               $author = $author_cache[$author];
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                                       $item['author'] = array(array('data' => $author));
-                               }
-                               if (isset($entry['properties']['photo'][0])) {
-                                       // If a photo is also in content, don't need to add it again here.
-                                       $content = '';
-                                       if (isset($entry['properties']['content'][0]['html'])) {
-                                               $content = $entry['properties']['content'][0]['html'];
-                                       }
-                                       $photo_list = array();
-                                       for ($j = 0; $j < count($entry['properties']['photo']); $j++) {
-                                               $photo = $entry['properties']['photo'][$j];
-                                               if (!empty($photo) && strpos($content, $photo) === false) {
-                                                       $photo_list[] = $photo;
-                                               }
-                                       }
-                                       // When there's more than one photo show the first and use a lightbox.
-                                       // Need a permanent, unique name for the image set, but don't have
-                                       // anything unique except for the content itself, so use that.
-                                       $count = count($photo_list);
-                                       if ($count > 1) {
-                                               $image_set_id = preg_replace('/[[:^alnum:]]/', '', $photo_list[0]);
-                                               $description = '<p>';
-                                               for ($j = 0; $j < $count; $j++) {
-                                                       $hidden = $j === 0 ? '' : 'class="hidden" ';
-                                                       $description .= '<a href="'.$photo_list[$j].'" '.$hidden.
-                                                               'data-lightbox="image-set-'.$image_set_id.'">'.
-                                                               '<img src="'.$photo_list[$j].'"></a>';
-                                               }
-                                               $description .= '<br><b>'.$count.' photos</b></p>';
-                                       }
-                                       else if ($count == 1) {
-                                               $description = '<p><img src="'.$photo_list[0].'"></p>';
-                                       }
-                               }
-                               if (isset($entry['properties']['content'][0]['html'])) {
-                                       // e-content['value'] is the same as p-name when they are on the same
-                                       // element. Use this to replace title with a strip_tags version so
-                                       // that alt text from images is not included in the title.
-                                       if ($entry['properties']['content'][0]['value'] === $title) {
-                                               $title = strip_tags($entry['properties']['content'][0]['html']);
-                                               $item['title'] = array(array('data' => $title));
-                                       }
-                                       $description .= $entry['properties']['content'][0]['html'];
-                                       if (isset($entry['properties']['in-reply-to'][0])) {
-                                               $in_reply_to = '';
-                                               if (is_string($entry['properties']['in-reply-to'][0])) {
-                                                       $in_reply_to = $entry['properties']['in-reply-to'][0];
-                                               }
-                                               else if (isset($entry['properties']['in-reply-to'][0]['value'])) {
-                                                       $in_reply_to = $entry['properties']['in-reply-to'][0]['value'];
-                                               }
-                                               if ($in_reply_to !== '') {
-                                                       $description .= '<p><span class="in-reply-to"></span> '.
-                                                               '<a href="'.$in_reply_to.'">'.$in_reply_to.'</a><p>';
-                                               }
-                                       }
-                                       $item['description'] = array(array('data' => $description));
-                               }
-                               if (isset($entry['properties']['category'])) {
-                                       $category_csv = '';
-                                       // Categories can also contain h-cards.
-                                       foreach ($entry['properties']['category'] as $category) {
-                                               if ($category_csv !== '') $category_csv .= ', ';
-                                               if (is_string($category)) {
-                                                       // Can't have commas in categories.
-                                                       $category_csv .= str_replace(',', '', $category);
-                                               }
-                                               else {
-                                                       $category_csv .= $this->parse_hcard($category, true);
-                                               }
-                                       }
-                                       $item['category'] = array(array('data' => $category_csv));
-                               }
-                               if (isset($entry['properties']['published'][0])) {
-                                       $timestamp = strtotime($entry['properties']['published'][0]);
-                                       $pub_date = date('F j Y g:ia', $timestamp).' GMT';
-                                       $item['pubDate'] = array(array('data' => $pub_date));
-                               }
-                               // The title and description are set to the empty string to represent
-                               // a deleted item (which also makes it an invalid rss item).
-                               if (isset($entry['properties']['deleted'][0])) {
-                                       $item['title'] = array(array('data' => ''));
-                                       $item['description'] = array(array('data' => ''));
-                               }
-                               $items[] = array('child' => array('' => $item));
-                       }
-               }
-               // Mimic RSS data format when storing microformats.
-               $link = array(array('data' => $url));
-               $image = '';
-               if (!is_string($feed_author) &&
-                               isset($feed_author['properties']['photo'][0])) {
-                       $image = array(array('child' => array('' => array('url' =>
-                               array(array('data' => $feed_author['properties']['photo'][0]))))));
-               }
-               // Use the name given for the h-feed, or get the title from the html.
-               if ($feed_title !== '') {
-                       $feed_title = array(array('data' => htmlspecialchars($feed_title)));
-               }
-               else if ($position = strpos($data, '<title>')) {
-                       $start = $position < 200 ? 0 : $position - 200;
-                       $check = substr($data, $start, 400);
-                       $matches = array();
-                       if (preg_match('/<title>(.+)<\/title>/', $check, $matches)) {
-                               $feed_title = array(array('data' => htmlspecialchars($matches[1])));
-                       }
-               }
-               $channel = array('channel' => array(array('child' => array('' =>
-                       array('link' => $link, 'image' => $image, 'title' => $feed_title,
-                             'item' => $items)))));
-               $rss = array(array('attribs' => array('' => array('version' => '2.0')),
-                                  'child' => array('' => $channel)));
-               $this->data = array('child' => array('' => array('rss' => $rss)));
-               return true;
-       }
-
-       private function declare_html_entities() {
-               // This is required because the RSS specification says that entity-encoded
-               // html is allowed, but the xml specification says they must be declared.
-               return '<!DOCTYPE html [ <!ENTITY nbsp "&#x00A0;"> <!ENTITY iexcl "&#x00A1;"> <!ENTITY cent "&#x00A2;"> <!ENTITY pound "&#x00A3;"> <!ENTITY curren "&#x00A4;"> <!ENTITY yen "&#x00A5;"> <!ENTITY brvbar "&#x00A6;"> <!ENTITY sect "&#x00A7;"> <!ENTITY uml "&#x00A8;"> <!ENTITY copy "&#x00A9;"> <!ENTITY ordf "&#x00AA;"> <!ENTITY laquo "&#x00AB;"> <!ENTITY not "&#x00AC;"> <!ENTITY shy "&#x00AD;"> <!ENTITY reg "&#x00AE;"> <!ENTITY macr "&#x00AF;"> <!ENTITY deg "&#x00B0;"> <!ENTITY plusmn "&#x00B1;"> <!ENTITY sup2 "&#x00B2;"> <!ENTITY sup3 "&#x00B3;"> <!ENTITY acute "&#x00B4;"&g
 t; <!ENTITY micro "&#x00B5;"> <!ENTITY para "&#x00B6;"> <!ENTITY middot "&#x00B7;"> <!ENTITY cedil "&#x00B8;"> <!ENTITY sup1 "&#x00B9;"> <!ENTITY ordm "&#x00BA;"> <!ENTITY raquo "&#x00BB;"> <!ENTITY frac14 "&#x00BC;"> <!ENTITY frac12 "&#x00BD;"> <!ENTITY frac34 "&#x00BE;"> <!ENTITY iquest "&#x00BF;"> <!ENTITY Agrave "&#x00C0;"> <!ENTITY Aacute "&#x00C1;"> <!ENTITY Acirc "&#x00C2;"> <!ENTITY Atilde "&#x00C3;"> <!ENTITY Auml "&#x00C4;"> <!ENTITY Aring "&#x00C5;"> <!ENTITY AElig "&#x00C6;"> <!ENTITY Ccedil "&#x00C7;"> <!ENTITY Egrave "&#x00C8;"> <!ENTITY Eacute "&#x00C9;"> 
 <!ENTITY Ecirc "&#x00CA;"> <!ENTITY Euml "&#x00CB;"> <!ENTITY Igrave "&#x00CC;"> <!ENTITY Iacute "&#x00CD;"> <!ENTITY Icirc "&#x00CE;"> <!ENTITY Iuml "&#x00CF;"> <!ENTITY ETH "&#x00D0;"> <!ENTITY Ntilde "&#x00D1;"> <!ENTITY Ograve "&#x00D2;"> <!ENTITY Oacute "&#x00D3;"> <!ENTITY Ocirc "&#x00D4;"> <!ENTITY Otilde "&#x00D5;"> <!ENTITY Ouml "&#x00D6;"> <!ENTITY times "&#x00D7;"> <!ENTITY Oslash "&#x00D8;"> <!ENTITY Ugrave "&#x00D9;"> <!ENTITY Uacute "&#x00DA;"> <!ENTITY Ucirc "&#x00DB;"> <!ENTITY Uuml "&#x00DC;"> <!ENTITY Yacute "&#x00DD;"> <!ENTITY THORN "&#x00DE;"> <!E
 NTITY szlig "&#x00DF;"> <!ENTITY agrave "&#x00E0;"> <!ENTITY aacute "&#x00E1;"> <!ENTITY acirc "&#x00E2;"> <!ENTITY atilde "&#x00E3;"> <!ENTITY auml "&#x00E4;"> <!ENTITY aring "&#x00E5;"> <!ENTITY aelig "&#x00E6;"> <!ENTITY ccedil "&#x00E7;"> <!ENTITY egrave "&#x00E8;"> <!ENTITY eacute "&#x00E9;"> <!ENTITY ecirc "&#x00EA;"> <!ENTITY euml "&#x00EB;"> <!ENTITY igrave "&#x00EC;"> <!ENTITY iacute "&#x00ED;"> <!ENTITY icirc "&#x00EE;"> <!ENTITY iuml "&#x00EF;"> <!ENTITY eth "&#x00F0;"> <!ENTITY ntilde "&#x00F1;"> <!ENTITY ograve "&#x00F2;"> <!ENTITY oacute "&#x00F3;"> <!ENTIT
 Y ocirc "&#x00F4;"> <!ENTITY otilde "&#x00F5;"> <!ENTITY ouml "&#x00F6;"> <!ENTITY divide "&#x00F7;"> <!ENTITY oslash "&#x00F8;"> <!ENTITY ugrave "&#x00F9;"> <!ENTITY uacute "&#x00FA;"> <!ENTITY ucirc "&#x00FB;"> <!ENTITY uuml "&#x00FC;"> <!ENTITY yacute "&#x00FD;"> <!ENTITY thorn "&#x00FE;"> <!ENTITY yuml "&#x00FF;"> <!ENTITY OElig "&#x0152;"> <!ENTITY oelig "&#x0153;"> <!ENTITY Scaron "&#x0160;"> <!ENTITY scaron "&#x0161;"> <!ENTITY Yuml "&#x0178;"> <!ENTITY fnof "&#x0192;"> <!ENTITY circ "&#x02C6;"> <!ENTITY tilde "&#x02DC;"> <!ENTITY Alpha "&#x0391;"> <!ENTITY Beta &
 quot;&#x0392;"> <!ENTITY Gamma "&#x0393;"> <!ENTITY Epsilon "&#x0395;"> <!ENTITY Zeta "&#x0396;"> <!ENTITY Eta "&#x0397;"> <!ENTITY Theta "&#x0398;"> <!ENTITY Iota "&#x0399;"> <!ENTITY Kappa "&#x039A;"> <!ENTITY Lambda "&#x039B;"> <!ENTITY Mu "&#x039C;"> <!ENTITY Nu "&#x039D;"> <!ENTITY Xi "&#x039E;"> <!ENTITY Omicron "&#x039F;"> <!ENTITY Pi "&#x03A0;"> <!ENTITY Rho "&#x03A1;"> <!ENTITY Sigma "&#x03A3;"> <!ENTITY Tau "&#x03A4;"> <!ENTITY Upsilon "&#x03A5;"> <!ENTITY Phi "&#x03A6;"> <!ENTITY Chi "&#x03A7;"> <!ENTITY Psi "&#x03A8;"> <!ENTITY Omega "&#x03A9;"> &
 lt;!ENTITY alpha "&#x03B1;"> <!ENTITY beta "&#x03B2;"> <!ENTITY gamma "&#x03B3;"> <!ENTITY delta "&#x03B4;"> <!ENTITY epsilon "&#x03B5;"> <!ENTITY zeta "&#x03B6;"> <!ENTITY eta "&#x03B7;"> <!ENTITY theta "&#x03B8;"> <!ENTITY iota "&#x03B9;"> <!ENTITY kappa "&#x03BA;"> <!ENTITY lambda "&#x03BB;"> <!ENTITY mu "&#x03BC;"> <!ENTITY nu "&#x03BD;"> <!ENTITY xi "&#x03BE;"> <!ENTITY omicron "&#x03BF;"> <!ENTITY pi "&#x03C0;"> <!ENTITY rho "&#x03C1;"> <!ENTITY sigmaf "&#x03C2;"> <!ENTITY sigma "&#x03C3;"> <!ENTITY tau "&#x03C4;"> <!ENTITY upsilon "&#x03C5;"> <!ENTITY phi "&a
 mp;#x03C6;"> <!ENTITY chi "&#x03C7;"> <!ENTITY psi "&#x03C8;"> <!ENTITY omega "&#x03C9;"> <!ENTITY thetasym "&#x03D1;"> <!ENTITY upsih "&#x03D2;"> <!ENTITY piv "&#x03D6;"> <!ENTITY ensp "&#x2002;"> <!ENTITY emsp "&#x2003;"> <!ENTITY thinsp "&#x2009;"> <!ENTITY zwnj "&#x200C;"> <!ENTITY zwj "&#x200D;"> <!ENTITY lrm "&#x200E;"> <!ENTITY rlm "&#x200F;"> <!ENTITY ndash "&#x2013;"> <!ENTITY mdash "&#x2014;"> <!ENTITY lsquo "&#x2018;"> <!ENTITY rsquo "&#x2019;"> <!ENTITY sbquo "&#x201A;"> <!ENTITY ldquo "&#x201C;"> <!ENTITY rdquo "&#x201D;"> <!ENTITY bdquo "&#x201E;"> 
 <!ENTITY dagger "&#x2020;"> <!ENTITY Dagger "&#x2021;"> <!ENTITY bull "&#x2022;"> <!ENTITY hellip "&#x2026;"> <!ENTITY permil "&#x2030;"> <!ENTITY prime "&#x2032;"> <!ENTITY Prime "&#x2033;"> <!ENTITY lsaquo "&#x2039;"> <!ENTITY rsaquo "&#x203A;"> <!ENTITY oline "&#x203E;"> <!ENTITY frasl "&#x2044;"> <!ENTITY euro "&#x20AC;"> <!ENTITY image "&#x2111;"> <!ENTITY weierp "&#x2118;"> <!ENTITY real "&#x211C;"> <!ENTITY trade "&#x2122;"> <!ENTITY alefsym "&#x2135;"> <!ENTITY larr "&#x2190;"> <!ENTITY uarr "&#x2191;"> <!ENTITY rarr "&#x2192;"> <!ENTITY darr "&#x2193;"> <!ENT
 ITY harr "&#x2194;"> <!ENTITY crarr "&#x21B5;"> <!ENTITY lArr "&#x21D0;"> <!ENTITY uArr "&#x21D1;"> <!ENTITY rArr "&#x21D2;"> <!ENTITY dArr "&#x21D3;"> <!ENTITY hArr "&#x21D4;"> <!ENTITY forall "&#x2200;"> <!ENTITY part "&#x2202;"> <!ENTITY exist "&#x2203;"> <!ENTITY empty "&#x2205;"> <!ENTITY nabla "&#x2207;"> <!ENTITY isin "&#x2208;"> <!ENTITY notin "&#x2209;"> <!ENTITY ni "&#x220B;"> <!ENTITY prod "&#x220F;"> <!ENTITY sum "&#x2211;"> <!ENTITY minus "&#x2212;"> <!ENTITY lowast "&#x2217;"> <!ENTITY radic "&#x221A;"> <!ENTITY prop "&#x221D;"> <!ENTITY infin "&#x
 221E;"> <!ENTITY ang "&#x2220;"> <!ENTITY and "&#x2227;"> <!ENTITY or "&#x2228;"> <!ENTITY cap "&#x2229;"> <!ENTITY cup "&#x222A;"> <!ENTITY int "&#x222B;"> <!ENTITY there4 "&#x2234;"> <!ENTITY sim "&#x223C;"> <!ENTITY cong "&#x2245;"> <!ENTITY asymp "&#x2248;"> <!ENTITY ne "&#x2260;"> <!ENTITY equiv "&#x2261;"> <!ENTITY le "&#x2264;"> <!ENTITY ge "&#x2265;"> <!ENTITY sub "&#x2282;"> <!ENTITY sup "&#x2283;"> <!ENTITY nsub "&#x2284;"> <!ENTITY sube "&#x2286;"> <!ENTITY supe "&#x2287;"> <!ENTITY oplus "&#x2295;"> <!ENTITY otimes "&#x2297;"> <!ENTITY perp "&
 amp;#x22A5;"> <!ENTITY sdot "&#x22C5;"> <!ENTITY lceil "&#x2308;"> <!ENTITY rceil "&#x2309;"> <!ENTITY lfloor "&#x230A;"> <!ENTITY rfloor "&#x230B;"> <!ENTITY lang "&#x2329;"> <!ENTITY rang "&#x232A;"> <!ENTITY loz "&#x25CA;"> <!ENTITY spades "&#x2660;"> <!ENTITY clubs "&#x2663;"> <!ENTITY hearts "&#x2665;"> <!ENTITY diams "&#x2666;"> ]>';
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieRatingphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Rating.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Rating.php        2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Rating.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,124 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Handles `<media:rating>` or `<itunes:explicit>` tags as defined in Media RSS and iTunes RSS respectively
- *
- * Used by {@see SimplePie_Enclosure::get_rating()} and {@see SimplePie_Enclosure::get_ratings()}
- *
- * This class can be overloaded with {@see SimplePie::set_rating_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Rating
-{
-       /**
-        * Rating scheme
-        *
-        * @var string
-        * @see get_scheme()
-        */
-       var $scheme;
-
-       /**
-        * Rating value
-        *
-        * @var string
-        * @see get_value()
-        */
-       var $value;
-
-       /**
-        * Constructor, used to input the data
-        *
-        * For documentation on all the parameters, see the corresponding
-        * properties and their accessors
-        */
-       public function __construct($scheme = null, $value = null)
-       {
-               $this->scheme = $scheme;
-               $this->value = $value;
-       }
-
-       /**
-        * String-ified version
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               // There is no $this->data here
-               return md5(serialize($this));
-       }
-
-       /**
-        * Get the organizational scheme for the rating
-        *
-        * @return string|null
-        */
-       public function get_scheme()
-       {
-               if ($this->scheme !== null)
-               {
-                       return $this->scheme;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the value of the rating
-        *
-        * @return string|null
-        */
-       public function get_value()
-       {
-               if ($this->value !== null)
-               {
-                       return $this->value;
-               }
-
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieRegistryphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Registry.php      2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Registry.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,225 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Handles creating objects and calling methods
- *
- * Access this via {@see SimplePie::get_registry()}
- *
- * @package SimplePie
- */
-class SimplePie_Registry
-{
-       /**
-        * Default class mapping
-        *
-        * Overriding classes *must* subclass these.
-        *
-        * @var array
-        */
-       protected $default = array(
-               'Cache' => 'SimplePie_Cache',
-               'Locator' => 'SimplePie_Locator',
-               'Parser' => 'SimplePie_Parser',
-               'File' => 'SimplePie_File',
-               'Sanitize' => 'SimplePie_Sanitize',
-               'Item' => 'SimplePie_Item',
-               'Author' => 'SimplePie_Author',
-               'Category' => 'SimplePie_Category',
-               'Enclosure' => 'SimplePie_Enclosure',
-               'Caption' => 'SimplePie_Caption',
-               'Copyright' => 'SimplePie_Copyright',
-               'Credit' => 'SimplePie_Credit',
-               'Rating' => 'SimplePie_Rating',
-               'Restriction' => 'SimplePie_Restriction',
-               'Content_Type_Sniffer' => 'SimplePie_Content_Type_Sniffer',
-               'Source' => 'SimplePie_Source',
-               'Misc' => 'SimplePie_Misc',
-               'XML_Declaration_Parser' => 'SimplePie_XML_Declaration_Parser',
-               'Parse_Date' => 'SimplePie_Parse_Date',
-       );
-
-       /**
-        * Class mapping
-        *
-        * @see register()
-        * @var array
-        */
-       protected $classes = array();
-
-       /**
-        * Legacy classes
-        *
-        * @see register()
-        * @var array
-        */
-       protected $legacy = array();
-
-       /**
-        * Constructor
-        *
-        * No-op
-        */
-       public function __construct() { }
-
-       /**
-        * Register a class
-        *
-        * @param string $type See {@see $default} for names
-        * @param string $class Class name, must subclass the corresponding default
-        * @param bool $legacy Whether to enable legacy support for this class
-        * @return bool Successfulness
-        */
-       public function register($type, $class, $legacy = false)
-       {
-               if (!@is_subclass_of($class, $this->default[$type]))
-               {
-                       return false;
-               }
-
-               $this->classes[$type] = $class;
-
-               if ($legacy)
-               {
-                       $this->legacy[] = $class;
-               }
-
-               return true;
-       }
-
-       /**
-        * Get the class registered for a type
-        *
-        * Where possible, use {@see create()} or {@see call()} instead
-        *
-        * @param string $type
-        * @return string|null
-        */
-       public function get_class($type)
-       {
-               if (!empty($this->classes[$type]))
-               {
-                       return $this->classes[$type];
-               }
-               if (!empty($this->default[$type]))
-               {
-                       return $this->default[$type];
-               }
-
-               return null;
-       }
-
-       /**
-        * Create a new instance of a given type
-        *
-        * @param string $type
-        * @param array $parameters Parameters to pass to the constructor
-        * @return object Instance of class
-        */
-       public function &create($type, $parameters = array())
-       {
-               $class = $this->get_class($type);
-
-               if (in_array($class, $this->legacy))
-               {
-                       switch ($type)
-                       {
-                               case 'locator':
-                                       // Legacy: file, timeout, useragent, file_class, max_checked_feeds, content_type_sniffer_class
-                                       // Specified: file, timeout, useragent, max_checked_feeds
-                                       $replacement = array($this->get_class('file'), $parameters[3], $this->get_class('content_type_sniffer'));
-                                       array_splice($parameters, 3, 1, $replacement);
-                                       break;
-                       }
-               }
-
-               if (!method_exists($class, '__construct'))
-               {
-                       $instance = new $class;
-               }
-               else
-               {
-                       $reflector = new ReflectionClass($class);
-                       $instance = $reflector->newInstanceArgs($parameters);
-               }
-
-               if (method_exists($instance, 'set_registry'))
-               {
-                       $instance->set_registry($this);
-               }
-               return $instance;
-       }
-
-       /**
-        * Call a static method for a type
-        *
-        * @param string $type
-        * @param string $method
-        * @param array $parameters
-        * @return mixed
-        */
-       public function &call($type, $method, $parameters = array())
-       {
-               $class = $this->get_class($type);
-
-               if (in_array($class, $this->legacy))
-               {
-                       switch ($type)
-                       {
-                               case 'Cache':
-                                       // For backwards compatibility with old non-static
-                                       // Cache::create() methods in PHP < 8.0.
-                                       // No longer supported as of PHP 8.0.
-                                       if ($method === 'get_handler')
-                                       {
-                                               $result = @call_user_func_array(array($class, 'create'), $parameters);
-                                               return $result;
-                                       }
-                                       break;
-                       }
-               }
-
-               $result = call_user_func_array(array($class, $method), $parameters);
-               return $result;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieRestrictionphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Restriction.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Restriction.php   2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Restriction.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,148 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Handles `<media:restriction>` as defined in Media RSS
- *
- * Used by {@see SimplePie_Enclosure::get_restriction()} and {@see SimplePie_Enclosure::get_restrictions()}
- *
- * This class can be overloaded with {@see SimplePie::set_restriction_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Restriction
-{
-       /**
-        * Relationship ('allow'/'deny')
-        *
-        * @var string
-        * @see get_relationship()
-        */
-       var $relationship;
-
-       /**
-        * Type of restriction
-        *
-        * @var string
-        * @see get_type()
-        */
-       var $type;
-
-       /**
-        * Restricted values
-        *
-        * @var string
-        * @see get_value()
-        */
-       var $value;
-
-       /**
-        * Constructor, used to input the data
-        *
-        * For documentation on all the parameters, see the corresponding
-        * properties and their accessors
-        */
-       public function __construct($relationship = null, $type = null, $value = null)
-       {
-               $this->relationship = $relationship;
-               $this->type = $type;
-               $this->value = $value;
-       }
-
-       /**
-        * String-ified version
-        *
-        * @return string
-        */
-       public function __toString()
-       {
-               // There is no $this->data here
-               return md5(serialize($this));
-       }
-
-       /**
-        * Get the relationship
-        *
-        * @return string|null Either 'allow' or 'deny'
-        */
-       public function get_relationship()
-       {
-               if ($this->relationship !== null)
-               {
-                       return $this->relationship;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the type
-        *
-        * @return string|null
-        */
-       public function get_type()
-       {
-               if ($this->type !== null)
-               {
-                       return $this->type;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the list of restricted things
-        *
-        * @return string|null
-        */
-       public function get_value()
-       {
-               if ($this->value !== null)
-               {
-                       return $this->value;
-               }
-
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieSanitizephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Sanitize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Sanitize.php      2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Sanitize.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,656 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Used for data cleanup and post-processing
- *
- *
- * This class can be overloaded with {@see SimplePie::set_sanitize_class()}
- *
- * @package SimplePie
- * @todo Move to using an actual HTML parser (this will allow tags to be properly stripped, and to switch between HTML and XHTML), this will also make it easier to shorten a string while preserving HTML tags
- */
-class SimplePie_Sanitize
-{
-       // Private vars
-       var $base;
-
-       // Options
-       var $remove_div = true;
-       var $image_handler = '';
-       var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
-       var $encode_instead_of_strip = false;
-       var $strip_attributes = array('bgsound', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
-       var $add_attributes = array('audio' => array('preload' => 'none'), 'iframe' => array('sandbox' => 'allow-scripts allow-same-origin'), 'video' => array('preload' => 'none'));
-       var $strip_comments = false;
-       var $output_encoding = 'UTF-8';
-       var $enable_cache = true;
-       var $cache_location = './cache';
-       var $cache_name_function = 'md5';
-       var $timeout = 10;
-       var $useragent = '';
-       var $force_fsockopen = false;
-       var $replace_url_attributes = null;
-       var $registry;
-
-       /**
-        * List of domains for which to force HTTPS.
-        * @see SimplePie_Sanitize::set_https_domains()
-        * Array is a tree split at DNS levels. Example:
-        * array('biz' => true, 'com' => array('example' => true), 'net' => array('example' => array('www' => true)))
-        */
-       var $https_domains = array();
-
-       public function __construct()
-       {
-               // Set defaults
-               $this->set_url_replacements(null);
-       }
-
-       public function remove_div($enable = true)
-       {
-               $this->remove_div = (bool) $enable;
-       }
-
-       public function set_image_handler($page = false)
-       {
-               if ($page)
-               {
-                       $this->image_handler = (string) $page;
-               }
-               else
-               {
-                       $this->image_handler = false;
-               }
-       }
-
-       public function set_registry(SimplePie_Registry $registry)
-       {
-               $this->registry = $registry;
-       }
-
-       public function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie_Cache')
-       {
-               if (isset($enable_cache))
-               {
-                       $this->enable_cache = (bool) $enable_cache;
-               }
-
-               if ($cache_location)
-               {
-                       $this->cache_location = (string) $cache_location;
-               }
-
-               if ($cache_name_function)
-               {
-                       $this->cache_name_function = (string) $cache_name_function;
-               }
-       }
-
-       public function pass_file_data($file_class = 'SimplePie_File', $timeout = 10, $useragent = '', $force_fsockopen = false)
-       {
-               if ($timeout)
-               {
-                       $this->timeout = (string) $timeout;
-               }
-
-               if ($useragent)
-               {
-                       $this->useragent = (string) $useragent;
-               }
-
-               if ($force_fsockopen)
-               {
-                       $this->force_fsockopen = (string) $force_fsockopen;
-               }
-       }
-
-       public function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
-       {
-               if ($tags)
-               {
-                       if (is_array($tags))
-                       {
-                               $this->strip_htmltags = $tags;
-                       }
-                       else
-                       {
-                               $this->strip_htmltags = explode(',', $tags);
-                       }
-               }
-               else
-               {
-                       $this->strip_htmltags = false;
-               }
-       }
-
-       public function encode_instead_of_strip($encode = false)
-       {
-               $this->encode_instead_of_strip = (bool) $encode;
-       }
-
-       public function strip_attributes($attribs = array('bgsound', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'))
-       {
-               if ($attribs)
-               {
-                       if (is_array($attribs))
-                       {
-                               $this->strip_attributes = $attribs;
-                       }
-                       else
-                       {
-                               $this->strip_attributes = explode(',', $attribs);
-                       }
-               }
-               else
-               {
-                       $this->strip_attributes = false;
-               }
-       }
-
-       public function add_attributes($attribs = array('audio' => array('preload' => 'none'), 'iframe' => array('sandbox' => 'allow-scripts allow-same-origin'), 'video' => array('preload' => 'none')))
-       {
-               if ($attribs)
-               {
-                       if (is_array($attribs))
-                       {
-                               $this->add_attributes = $attribs;
-                       }
-                       else
-                       {
-                               $this->add_attributes = explode(',', $attribs);
-                       }
-               }
-               else
-               {
-                       $this->add_attributes = false;
-               }
-       }
-
-       public function strip_comments($strip = false)
-       {
-               $this->strip_comments = (bool) $strip;
-       }
-
-       public function set_output_encoding($encoding = 'UTF-8')
-       {
-               $this->output_encoding = (string) $encoding;
-       }
-
-       /**
-        * Set element/attribute key/value pairs of HTML attributes
-        * containing URLs that need to be resolved relative to the feed
-        *
-        * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite,
-        * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite,
-        * |q|@cite
-        *
-        * @since 1.0
-        * @param array|null $element_attribute Element/attribute key/value pairs, null for default
-        */
-       public function set_url_replacements($element_attribute = null)
-       {
-               if ($element_attribute === null)
-               {
-                       $element_attribute = array(
-                               'a' => 'href',
-                               'area' => 'href',
-                               'blockquote' => 'cite',
-                               'del' => 'cite',
-                               'form' => 'action',
-                               'img' => array(
-                                       'longdesc',
-                                       'src'
-                               ),
-                               'input' => 'src',
-                               'ins' => 'cite',
-                               'q' => 'cite'
-                       );
-               }
-               $this->replace_url_attributes = (array) $element_attribute;
-       }
-
-       /**
-        * Set the list of domains for which to force HTTPS.
-        * @see SimplePie_Misc::https_url()
-        * Example array('biz', 'example.com', 'example.org', 'www.example.net');
-        */
-       public function set_https_domains($domains)
-       {
-               $this->https_domains = array();
-               foreach ($domains as $domain)
-               {
-                       $domain = trim($domain, ". \t\n\r\0\x0B");
-                       $segments = array_reverse(explode('.', $domain));
-                       $node =& $this->https_domains;
-                       foreach ($segments as $segment)
-                       {//Build a tree
-                               if ($node === true)
-                               {
-                                       break;
-                               }
-                               if (!isset($node[$segment]))
-                               {
-                                       $node[$segment] = array();
-                               }
-                               $node =& $node[$segment];
-                       }
-                       $node = true;
-               }
-       }
-
-       /**
-        * Check if the domain is in the list of forced HTTPS.
-        */
-       protected function is_https_domain($domain)
-       {
-               $domain = trim($domain, '. ');
-               $segments = array_reverse(explode('.', $domain));
-               $node =& $this->https_domains;
-               foreach ($segments as $segment)
-               {//Explore the tree
-                       if (isset($node[$segment]))
-                       {
-                               $node =& $node[$segment];
-                       }
-                       else
-                       {
-                               break;
-                       }
-               }
-               return $node === true;
-       }
-
-       /**
-        * Force HTTPS for selected Web sites.
-        */
-       public function https_url($url)
-       {
-               return (strtolower(substr($url, 0, 7)) === 'http://') &&
-                       $this->is_https_domain(parse_url($url, PHP_URL_HOST)) ?
-                       substr_replace($url, 's', 4, 0) :       //Add the 's' to HTTPS
-                       $url;
-       }
-
-       public function sanitize($data, $type, $base = '')
-       {
-               $data = trim($data);
-               if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI)
-               {
-                       if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
-                       {
-                               if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
-                               {
-                                       $type |= SIMPLEPIE_CONSTRUCT_HTML;
-                               }
-                               else
-                               {
-                                       $type |= SIMPLEPIE_CONSTRUCT_TEXT;
-                               }
-                       }
-
-                       if ($type & SIMPLEPIE_CONSTRUCT_BASE64)
-                       {
-                               $data = base64_decode($data);
-                       }
-
-                       if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
-                       {
-
-                               if (!class_exists('DOMDocument'))
-                               {
-                                       throw new SimplePie_Exception('DOMDocument not found, unable to use sanitizer');
-                               }
-                               $document = new DOMDocument();
-                               $document->encoding = 'UTF-8';
-
-                               $data = $this->preprocess($data, $type);
-
-                               set_error_handler(array('SimplePie_Misc', 'silence_errors'));
-                               $document->loadHTML($data);
-                               restore_error_handler();
-
-                               $xpath = new DOMXPath($document);
-
-                               // Strip comments
-                               if ($this->strip_comments)
-                               {
-                                       $comments = $xpath->query('//comment()');
-
-                                       foreach ($comments as $comment)
-                                       {
-                                               $comment->parentNode->removeChild($comment);
-                                       }
-                               }
-
-                               // Strip out HTML tags and attributes that might cause various security problems.
-                               // Based on recommendations by Mark Pilgrim at:
-                               // http://diveintomark.org/archives/2003/06/12/how_to_consume_rss_safely
-                               if ($this->strip_htmltags)
-                               {
-                                       foreach ($this->strip_htmltags as $tag)
-                                       {
-                                               $this->strip_tag($tag, $document, $xpath, $type);
-                                       }
-                               }
-
-                               if ($this->strip_attributes)
-                               {
-                                       foreach ($this->strip_attributes as $attrib)
-                                       {
-                                               $this->strip_attr($attrib, $xpath);
-                                       }
-                               }
-
-                               if ($this->add_attributes)
-                               {
-                                       foreach ($this->add_attributes as $tag => $valuePairs)
-                                       {
-                                               $this->add_attr($tag, $valuePairs, $document);
-                                       }
-                               }
-
-                               // Replace relative URLs
-                               $this->base = $base;
-                               foreach ($this->replace_url_attributes as $element => $attributes)
-                               {
-                                       $this->replace_urls($document, $element, $attributes);
-                               }
-
-                               // If image handling (caching, etc.) is enabled, cache and rewrite all the image tags.
-                               if (isset($this->image_handler) && ((string) $this->image_handler) !== '' && $this->enable_cache)
-                               {
-                                       $images = $document->getElementsByTagName('img');
-                                       foreach ($images as $img)
-                                       {
-                                               if ($img->hasAttribute('src'))
-                                               {
-                                                       $image_url = call_user_func($this->cache_name_function, $img->getAttribute('src'));
-                                                       $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi'));
-
-                                                       if ($cache->load())
-                                                       {
-                                                               $img->setAttribute('src', $this->image_handler . $image_url);
-                                                       }
-                                                       else
-                                                       {
-                                                               $file = $this->registry->create('File', array($img->getAttribute('src'), $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen));
-                                                               $headers = $file->headers;
-
-                                                               if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
-                                                               {
-                                                                       if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
-                                                                       {
-                                                                               $img->setAttribute('src', $this->image_handler . $image_url);
-                                                                       }
-                                                                       else
-                                                                       {
-                                                                               trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-
-                               // Get content node
-                               $div = $document->getElementsByTagName('body')->item(0)->firstChild;
-                               // Finally, convert to a HTML string
-                               $data = trim($document->saveHTML($div));
-
-                               if ($this->remove_div)
-                               {
-                                       $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
-                                       $data = preg_replace('/<\/div>$/', '', $data);
-                               }
-                               else
-                               {
-                                       $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
-                               }
-                       }
-
-                       if ($type & SIMPLEPIE_CONSTRUCT_IRI)
-                       {
-                               $absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
-                               if ($absolute !== false)
-                               {
-                                       $data = $absolute;
-                               }
-                       }
-
-                       if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
-                       {
-                               $data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
-                       }
-
-                       if ($this->output_encoding !== 'UTF-8')
-                       {
-                               $data = $this->registry->call('Misc', 'change_encoding', array($data, 'UTF-8', $this->output_encoding));
-                       }
-               }
-               return $data;
-       }
-
-       protected function preprocess($html, $type)
-       {
-               $ret = '';
-               $html = preg_replace('%</?(?:html|body)[^>]*?'.'>%is', '', $html);
-               if ($type & ~SIMPLEPIE_CONSTRUCT_XHTML)
-               {
-                       // Atom XHTML constructs are wrapped with a div by default
-                       // Note: No protection if $html contains a stray </div>!
-                       $html = '<div>' . $html . '</div>';
-                       $ret .= '<!DOCTYPE html>';
-                       $content_type = 'text/html';
-               }
-               else
-               {
-                       $ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-                       $content_type = 'application/xhtml+xml';
-               }
-
-               $ret .= '<html><head>';
-               $ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
-               $ret .= '</head><body>' . $html . '</body></html>';
-               return $ret;
-       }
-
-       public function replace_urls($document, $tag, $attributes)
-       {
-               if (!is_array($attributes))
-               {
-                       $attributes = array($attributes);
-               }
-
-               if (!is_array($this->strip_htmltags) || !in_array($tag, $this->strip_htmltags))
-               {
-                       $elements = $document->getElementsByTagName($tag);
-                       foreach ($elements as $element)
-                       {
-                               foreach ($attributes as $attribute)
-                               {
-                                       if ($element->hasAttribute($attribute))
-                                       {
-                                               $value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base));
-                                               if ($value !== false)
-                                               {
-                                                       $value = $this->https_url($value);
-                                                       $element->setAttribute($attribute, $value);
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-
-       public function do_strip_htmltags($match)
-       {
-               if ($this->encode_instead_of_strip)
-               {
-                       if (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
-                       {
-                               $match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
-                               $match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
-                               return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
-                       }
-                       else
-                       {
-                               return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
-                       }
-               }
-               elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
-               {
-                       return $match[4];
-               }
-               else
-               {
-                       return '';
-               }
-       }
-
-       protected function strip_tag($tag, $document, $xpath, $type)
-       {
-               $elements = $xpath->query('body//' . $tag);
-               if ($this->encode_instead_of_strip)
-               {
-                       foreach ($elements as $element)
-                       {
-                               $fragment = $document->createDocumentFragment();
-
-                               // For elements which aren't script or style, include the tag itself
-                               if (!in_array($tag, array('script', 'style')))
-                               {
-                                       $text = '<' . $tag;
-                                       if ($element->hasAttributes())
-                                       {
-                                               $attrs = array();
-                                               foreach ($element->attributes as $name => $attr)
-                                               {
-                                                       $value = $attr->value;
-
-                                                       // In XHTML, empty values should never exist, so we repeat the value
-                                                       if (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_XHTML))
-                                                       {
-                                                               $value = $name;
-                                                       }
-                                                       // For HTML, empty is fine
-                                                       elseif (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_HTML))
-                                                       {
-                                                               $attrs[] = $name;
-                                                               continue;
-                                                       }
-
-                                                       // Standard attribute text
-                                                       $attrs[] = $name . '="' . $attr->value . '"';
-                                               }
-                                               $text .= ' ' . implode(' ', $attrs);
-                                       }
-                                       $text .= '>';
-                                       $fragment->appendChild(new DOMText($text));
-                               }
-
-                               $number = $element->childNodes->length;
-                               for ($i = $number; $i > 0; $i--)
-                               {
-                                       $child = $element->childNodes->item(0);
-                                       $fragment->appendChild($child);
-                               }
-
-                               if (!in_array($tag, array('script', 'style')))
-                               {
-                                       $fragment->appendChild(new DOMText('</' . $tag . '>'));
-                               }
-
-                               $element->parentNode->replaceChild($fragment, $element);
-                       }
-
-                       return;
-               }
-               elseif (in_array($tag, array('script', 'style')))
-               {
-                       foreach ($elements as $element)
-                       {
-                               $element->parentNode->removeChild($element);
-                       }
-
-                       return;
-               }
-               else
-               {
-                       foreach ($elements as $element)
-                       {
-                               $fragment = $document->createDocumentFragment();
-                               $number = $element->childNodes->length;
-                               for ($i = $number; $i > 0; $i--)
-                               {
-                                       $child = $element->childNodes->item(0);
-                                       $fragment->appendChild($child);
-                               }
-
-                               $element->parentNode->replaceChild($fragment, $element);
-                       }
-               }
-       }
-
-       protected function strip_attr($attrib, $xpath)
-       {
-               $elements = $xpath->query('//*[@' . $attrib . ']');
-
-               foreach ($elements as $element)
-               {
-                       $element->removeAttribute($attrib);
-               }
-       }
-
-       protected function add_attr($tag, $valuePairs, $document)
-       {
-               $elements = $document->getElementsByTagName($tag);
-               foreach ($elements as $element)
-               {
-                       foreach ($valuePairs as $attrib => $value)
-                       {
-                               $element->setAttribute($attrib, $value);
-                       }
-               }
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieSourcephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/Source.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Source.php        2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/Source.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,577 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * Handles `<atom:source>`
- *
- * Used by {@see SimplePie_Item::get_source()}
- *
- * This class can be overloaded with {@see SimplePie::set_source_class()}
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie_Source
-{
-       var $item;
-       var $data = array();
-       protected $registry;
-
-       public function __construct($item, $data)
-       {
-               $this->item = $item;
-               $this->data = $data;
-       }
-
-       public function set_registry(SimplePie_Registry $registry)
-       {
-               $this->registry = $registry;
-       }
-
-       public function __toString()
-       {
-               return md5(serialize($this->data));
-       }
-
-       public function get_source_tags($namespace, $tag)
-       {
-               if (isset($this->data['child'][$namespace][$tag]))
-               {
-                       return $this->data['child'][$namespace][$tag];
-               }
-
-               return null;
-       }
-
-       public function get_base($element = array())
-       {
-               return $this->item->get_base($element);
-       }
-
-       public function sanitize($data, $type, $base = '')
-       {
-               return $this->item->sanitize($data, $type, $base);
-       }
-
-       public function get_item()
-       {
-               return $this->item;
-       }
-
-       public function get_title()
-       {
-               if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-
-               return null;
-       }
-
-       public function get_category($key = 0)
-       {
-               $categories = $this->get_categories();
-               if (isset($categories[$key]))
-               {
-                       return $categories[$key];
-               }
-
-               return null;
-       }
-
-       public function get_categories()
-       {
-               $categories = array();
-
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
-               {
-                       $term = null;
-                       $scheme = null;
-                       $label = null;
-                       if (isset($category['attribs']['']['term']))
-                       {
-                               $term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($category['attribs']['']['scheme']))
-                       {
-                               $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($category['attribs']['']['label']))
-                       {
-                               $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       $categories[] = $this->registry->create('Category', array($term, $scheme, $label));
-               }
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
-               {
-                       // This is really the label, but keep this as the term also for BC.
-                       // Label will also work on retrieving because that falls back to term.
-                       $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       if (isset($category['attribs']['']['domain']))
-                       {
-                               $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       else
-                       {
-                               $scheme = null;
-                       }
-                       $categories[] = $this->registry->create('Category', array($term, $scheme, null));
-               }
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
-               {
-                       $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
-               {
-                       $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-
-               if (!empty($categories))
-               {
-                       return array_unique($categories);
-               }
-
-               return null;
-       }
-
-       public function get_author($key = 0)
-       {
-               $authors = $this->get_authors();
-               if (isset($authors[$key]))
-               {
-                       return $authors[$key];
-               }
-
-               return null;
-       }
-
-       public function get_authors()
-       {
-               $authors = array();
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
-               {
-                       $name = null;
-                       $uri = null;
-                       $email = null;
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
-                       {
-                               $uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
-                       }
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $uri !== null)
-                       {
-                               $authors[] = $this->registry->create('Author', array($name, $uri, $email));
-                       }
-               }
-               if ($author = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
-               {
-                       $name = null;
-                       $url = null;
-                       $email = null;
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
-                       {
-                               $url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
-                       }
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $url !== null)
-                       {
-                               $authors[] = $this->registry->create('Author', array($name, $url, $email));
-                       }
-               }
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-
-               if (!empty($authors))
-               {
-                       return array_unique($authors);
-               }
-
-               return null;
-       }
-
-       public function get_contributor($key = 0)
-       {
-               $contributors = $this->get_contributors();
-               if (isset($contributors[$key]))
-               {
-                       return $contributors[$key];
-               }
-
-               return null;
-       }
-
-       public function get_contributors()
-       {
-               $contributors = array();
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
-               {
-                       $name = null;
-                       $uri = null;
-                       $email = null;
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
-                       {
-                               $uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $uri !== null)
-                       {
-                               $contributors[] = $this->registry->create('Author', array($name, $uri, $email));
-                       }
-               }
-               foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
-               {
-                       $name = null;
-                       $url = null;
-                       $email = null;
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
-                       {
-                               $url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $url !== null)
-                       {
-                               $contributors[] = $this->registry->create('Author', array($name, $url, $email));
-                       }
-               }
-
-               if (!empty($contributors))
-               {
-                       return array_unique($contributors);
-               }
-
-               return null;
-       }
-
-       public function get_link($key = 0, $rel = 'alternate')
-       {
-               $links = $this->get_links($rel);
-               if (isset($links[$key]))
-               {
-                       return $links[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Added for parity between the parent-level and the item/entry-level.
-        */
-       public function get_permalink()
-       {
-               return $this->get_link(0);
-       }
-
-       public function get_links($rel = 'alternate')
-       {
-               if (!isset($this->data['links']))
-               {
-                       $this->data['links'] = array();
-                       if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
-                       {
-                               foreach ($links as $link)
-                               {
-                                       if (isset($link['attribs']['']['href']))
-                                       {
-                                               $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-                                               $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-                                       }
-                               }
-                       }
-                       if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'))
-                       {
-                               foreach ($links as $link)
-                               {
-                                       if (isset($link['attribs']['']['href']))
-                                       {
-                                               $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-                                               $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-
-                                       }
-                               }
-                       }
-                       if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-                       if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-                       if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-
-                       $keys = array_keys($this->data['links']);
-                       foreach ($keys as $key)
-                       {
-                               if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
-                               {
-                                       if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
-                                       {
-                                               $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-                                               $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-                                       }
-                                       else
-                                       {
-                                               $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
-                                       }
-                               }
-                               elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
-                               {
-                                       $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
-                               }
-                               $this->data['links'][$key] = array_unique($this->data['links'][$key]);
-                       }
-               }
-
-               if (isset($this->data['links'][$rel]))
-               {
-                       return $this->data['links'][$rel];
-               }
-
-               return null;
-       }
-
-       public function get_description()
-       {
-               if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-               }
-
-               return null;
-       }
-
-       public function get_copyright()
-       {
-               if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-
-               return null;
-       }
-
-       public function get_language()
-       {
-               if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif (isset($this->data['xml_lang']))
-               {
-                       return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-
-               return null;
-       }
-
-       public function get_latitude()
-       {
-               if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
-               {
-                       return (float) $match[1];
-               }
-
-               return null;
-       }
-
-       public function get_longitude()
-       {
-               if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
-               {
-                       return (float) $match[2];
-               }
-
-               return null;
-       }
-
-       public function get_image_url()
-       {
-               if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
-               {
-                       return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-
-               return null;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePieautoloaderphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/autoloader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/autoloader.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/autoloader.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,128 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * PSR-4 implementation for SimplePie.
+ *
+ * After registering this autoload function with SPL, the following line
+ * would cause the function to attempt to load the \SimplePie\SimplePie class
+ * from /src/SimplePie.php:
+ *
+ *      new \SimplePie\SimplePie();
+ *
+ * @param string $class The fully-qualified class name.
+ * @return void
+ */
+spl_autoload_register(function ($class) {
+
+    // project-specific namespace prefix
+    $prefix = 'SimplePie\\';
+
+    // base directory for the namespace prefix
+    $base_dir = __DIR__ . '/src/';
+
+    // does the class use the namespace prefix?
+    $len = strlen($prefix);
+    if (strncmp($prefix, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return;
+    }
+
+    // get the relative class name
+    $relative_class = substr($class, $len);
+
+    // replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+
+    // if the file exists, require it
+    if (file_exists($file)) {
+        require $file;
+    }
+});
+
+// autoloader
+spl_autoload_register(array(new SimplePie_Autoloader(), 'autoload'));
+
+if (!class_exists('SimplePie'))
+{
+       exit('Autoloader not registered properly');
+}
+
+/**
+ * Autoloader class
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Autoloader
+{
+       protected $path;
+
+       /**
+        * Constructor
+        */
+       public function __construct()
+       {
+               $this->path = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'library';
+       }
+
+       /**
+        * Autoloader
+        *
+        * @param string $class The name of the class to attempt to load.
+        */
+       public function autoload($class)
+       {
+               // Only load the class if it starts with "SimplePie"
+               if (strpos($class, 'SimplePie') !== 0)
+               {
+                       return;
+               }
+
+               $filename = $this->path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+               include $filename;
+       }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/autoloader.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePiegzdecodephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/SimplePie/gzdecode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/gzdecode.php      2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/gzdecode.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,366 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-
-/**
- * Decode 'gzip' encoded HTTP data
- *
- * @package SimplePie
- * @subpackage HTTP
- * @link http://www.gzip.org/format.txt
- */
-class SimplePie_gzdecode
-{
-       /**
-        * Compressed data
-        *
-        * @access private
-        * @var string
-        * @see gzdecode::$data
-        */
-       var $compressed_data;
-
-       /**
-        * Size of compressed data
-        *
-        * @access private
-        * @var int
-        */
-       var $compressed_size;
-
-       /**
-        * Minimum size of a valid gzip string
-        *
-        * @access private
-        * @var int
-        */
-       var $min_compressed_size = 18;
-
-       /**
-        * Current position of pointer
-        *
-        * @access private
-        * @var int
-        */
-       var $position = 0;
-
-       /**
-        * Flags (FLG)
-        *
-        * @access private
-        * @var int
-        */
-       var $flags;
-
-       /**
-        * Uncompressed data
-        *
-        * @access public
-        * @see gzdecode::$compressed_data
-        * @var string
-        */
-       var $data;
-
-       /**
-        * Modified time
-        *
-        * @access public
-        * @var int
-        */
-       var $MTIME;
-
-       /**
-        * Extra Flags
-        *
-        * @access public
-        * @var int
-        */
-       var $XFL;
-
-       /**
-        * Operating System
-        *
-        * @access public
-        * @var int
-        */
-       var $OS;
-
-       /**
-        * Subfield ID 1
-        *
-        * @access public
-        * @see gzdecode::$extra_field
-        * @see gzdecode::$SI2
-        * @var string
-        */
-       var $SI1;
-
-       /**
-        * Subfield ID 2
-        *
-        * @access public
-        * @see gzdecode::$extra_field
-        * @see gzdecode::$SI1
-        * @var string
-        */
-       var $SI2;
-
-       /**
-        * Extra field content
-        *
-        * @access public
-        * @see gzdecode::$SI1
-        * @see gzdecode::$SI2
-        * @var string
-        */
-       var $extra_field;
-
-       /**
-        * Original filename
-        *
-        * @access public
-        * @var string
-        */
-       var $filename;
-
-       /**
-        * Human readable comment
-        *
-        * @access public
-        * @var string
-        */
-       var $comment;
-
-       /**
-        * Don't allow anything to be set
-        *
-        * @param string $name
-        * @param mixed $value
-        */
-       public function __set($name, $value)
-       {
-               trigger_error("Cannot write property $name", E_USER_ERROR);
-       }
-
-       /**
-        * Set the compressed string and related properties
-        *
-        * @param string $data
-        */
-       public function __construct($data)
-       {
-               $this->compressed_data = $data;
-               $this->compressed_size = strlen($data);
-       }
-
-       /**
-        * Decode the GZIP stream
-        *
-        * @return bool Successfulness
-        */
-       public function parse()
-       {
-               if ($this->compressed_size >= $this->min_compressed_size)
-               {
-                       // Check ID1, ID2, and CM
-                       if (substr($this->compressed_data, 0, 3) !== "\x1F\x8B\x08")
-                       {
-                               return false;
-                       }
-
-                       // Get the FLG (FLaGs)
-                       $this->flags = ord($this->compressed_data[3]);
-
-                       // FLG bits above (1 << 4) are reserved
-                       if ($this->flags > 0x1F)
-                       {
-                               return false;
-                       }
-
-                       // Advance the pointer after the above
-                       $this->position += 4;
-
-                       // MTIME
-                       $mtime = substr($this->compressed_data, $this->position, 4);
-                       // Reverse the string if we're on a big-endian arch because l is the only signed long and is machine endianness
-                       if (current(unpack('S', "\x00\x01")) === 1)
-                       {
-                               $mtime = strrev($mtime);
-                       }
-                       $this->MTIME = current(unpack('l', $mtime));
-                       $this->position += 4;
-
-                       // Get the XFL (eXtra FLags)
-                       $this->XFL = ord($this->compressed_data[$this->position++]);
-
-                       // Get the OS (Operating System)
-                       $this->OS = ord($this->compressed_data[$this->position++]);
-
-                       // Parse the FEXTRA
-                       if ($this->flags & 4)
-                       {
-                               // Read subfield IDs
-                               $this->SI1 = $this->compressed_data[$this->position++];
-                               $this->SI2 = $this->compressed_data[$this->position++];
-
-                               // SI2 set to zero is reserved for future use
-                               if ($this->SI2 === "\x00")
-                               {
-                                       return false;
-                               }
-
-                               // Get the length of the extra field
-                               $len = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
-                               $this->position += 2;
-
-                               // Check the length of the string is still valid
-                               $this->min_compressed_size += $len + 4;
-                               if ($this->compressed_size >= $this->min_compressed_size)
-                               {
-                                       // Set the extra field to the given data
-                                       $this->extra_field = substr($this->compressed_data, $this->position, $len);
-                                       $this->position += $len;
-                               }
-                               else
-                               {
-                                       return false;
-                               }
-                       }
-
-                       // Parse the FNAME
-                       if ($this->flags & 8)
-                       {
-                               // Get the length of the filename
-                               $len = strcspn($this->compressed_data, "\x00", $this->position);
-
-                               // Check the length of the string is still valid
-                               $this->min_compressed_size += $len + 1;
-                               if ($this->compressed_size >= $this->min_compressed_size)
-                               {
-                                       // Set the original filename to the given string
-                                       $this->filename = substr($this->compressed_data, $this->position, $len);
-                                       $this->position += $len + 1;
-                               }
-                               else
-                               {
-                                       return false;
-                               }
-                       }
-
-                       // Parse the FCOMMENT
-                       if ($this->flags & 16)
-                       {
-                               // Get the length of the comment
-                               $len = strcspn($this->compressed_data, "\x00", $this->position);
-
-                               // Check the length of the string is still valid
-                               $this->min_compressed_size += $len + 1;
-                               if ($this->compressed_size >= $this->min_compressed_size)
-                               {
-                                       // Set the original comment to the given string
-                                       $this->comment = substr($this->compressed_data, $this->position, $len);
-                                       $this->position += $len + 1;
-                               }
-                               else
-                               {
-                                       return false;
-                               }
-                       }
-
-                       // Parse the FHCRC
-                       if ($this->flags & 2)
-                       {
-                               // Check the length of the string is still valid
-                               $this->min_compressed_size += $len + 2;
-                               if ($this->compressed_size >= $this->min_compressed_size)
-                               {
-                                       // Read the CRC
-                                       $crc = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
-
-                                       // Check the CRC matches
-                                       if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
-                                       {
-                                               $this->position += 2;
-                                       }
-                                       else
-                                       {
-                                               return false;
-                                       }
-                               }
-                               else
-                               {
-                                       return false;
-                               }
-                       }
-
-                       // Decompress the actual data
-                       if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false)
-                       {
-                               return false;
-                       }
-
-                       $this->position = $this->compressed_size - 8;
-
-                       // Check CRC of data
-                       $crc = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
-                       $this->position += 4;
-                       /*if (extension_loaded('hash') && sprintf('%u', current(unpack('V', hash('crc32b', $this->data)))) !== sprintf('%u', $crc))
-                       {
-                               return false;
-                       }*/
-
-                       // Check ISIZE of data
-                       $isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
-                       $this->position += 4;
-                       if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize))
-                       {
-                               return false;
-                       }
-
-                       // Wow, against all odds, we've actually got a valid gzip string
-                       return true;
-               }
-
-               return false;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesSimplePielibrarySimplePieAuthorphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Author.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Author.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Author.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Author;
+
+class_exists('SimplePie\Author');
+
+// @trigger_error(sprintf('Using the "SimplePie_Author" class is deprecated since SimplePie 1.7.0, use "SimplePie\Author" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Author" instead */
+    class SimplePie_Author extends Author
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Author.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCacheBasephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Base.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Base.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Cache\Base;
+
+interface_exists('SimplePie\Cache\Base');
+
+// @trigger_error(sprintf('Using the "SimplePie_Cache_Base" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Base" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Base" instead */
+    interface SimplePie_Cache_Base extends Base
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Base.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCacheDBphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/DB.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/DB.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/DB.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Cache\DB;
+
+class_exists('SimplePie\Cache\DB');
+
+// @trigger_error(sprintf('Using the "SimplePie_Cache_DB" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\DB" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\DB" instead */
+    abstract class SimplePie_Cache_DB extends DB
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/DB.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCacheFilephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/File.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/File.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/File.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Cache\File;
+
+class_exists('SimplePie\Cache\File');
+
+// @trigger_error(sprintf('Using the "SimplePie_Cache_File" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\File" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\File" instead */
+    class SimplePie_Cache_File extends File
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/File.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCacheMemcachephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcache.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcache.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Cache\Memcache;
+
+class_exists('SimplePie\Cache\Memcache');
+
+// @trigger_error(sprintf('Using the "SimplePie_Cache_Memcache" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Memcache" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Memcache" instead */
+    class SimplePie_Cache_Memcache extends Memcache
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcache.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCacheMemcachedphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcached.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcached.php                             (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcached.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Cache\Memcached;
+
+class_exists('SimplePie\Cache\Memcached');
+
+// @trigger_error(sprintf('Using the "SimplePie_Cache_Memcached" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Memcached" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Memcached" instead */
+    class SimplePie_Cache_Memcached extends Memcached
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Memcached.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCacheMySQLphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/MySQL.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/MySQL.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/MySQL.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Cache\MySQL;
+
+class_exists('SimplePie\Cache\MySQL');
+
+// @trigger_error(sprintf('Using the "SimplePie_Cache_MySQL" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\MySQL" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\MySQL" instead */
+    class SimplePie_Cache_MySQL extends MySQL
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/MySQL.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCacheRedisphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Redis.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Redis.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Redis.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,24 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie Redis Cache Extension
+ *
+ * @package SimplePie
+ * @author Jan Kozak <galvani78@gmail.com>
+ * @link http://galvani.cz/
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version 0.2.9
+ */
+
+use SimplePie\Cache\Redis;
+
+class_exists('SimplePie\Cache\Redis');
+
+// @trigger_error(sprintf('Using the "SimplePie_Cache_Redis" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Redis" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Redis" instead */
+    class SimplePie_Cache_Redis extends Redis
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache/Redis.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCachephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Cache.php                               (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Cache.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Cache;
+
+class_exists('SimplePie\Cache');
+
+// @trigger_error(sprintf('Using the "SimplePie_Cache" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache" instead */
+    class SimplePie_Cache extends Cache
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Cache.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCaptionphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Caption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Caption.php                             (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Caption.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Caption;
+
+class_exists('SimplePie\Caption');
+
+// @trigger_error(sprintf('Using the "SimplePie_Caption" class is deprecated since SimplePie 1.7.0, use "SimplePie\Caption" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Caption" instead */
+    class SimplePie_Caption extends Caption
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Caption.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCategoryphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Category.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Category.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Category;
+
+class_exists('SimplePie\Category');
+
+// @trigger_error(sprintf('Using the "SimplePie_Category" class is deprecated since SimplePie 1.7.0, use "SimplePie\Category" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Category" instead */
+    class SimplePie_Category extends Category
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Category.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieContentTypeSnifferphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Content/Type/Sniffer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Content/Type/Sniffer.php                                (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Content/Type/Sniffer.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Content\Type\Sniffer;
+
+class_exists('SimplePie\Content\Type\Sniffer');
+
+// @trigger_error(sprintf('Using the "SimplePie_Content_Type_Sniffer" class is deprecated since SimplePie 1.7.0, use "SimplePie\Content\Type\Sniffer" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Content\Type\Sniffer" instead */
+    class SimplePie_Content_Type_Sniffer extends Sniffer
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Content/Type/Sniffer.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCopyrightphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Copyright.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Copyright.php                           (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Copyright.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Copyright;
+
+class_exists('SimplePie\Copyright');
+
+// @trigger_error(sprintf('Using the "SimplePie_Copyright" class is deprecated since SimplePie 1.7.0, use "SimplePie\Copyright" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Copyright" instead */
+    class SimplePie_Copyright extends Copyright
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Copyright.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCorephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Core.php                                (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Core.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * SimplePie class.
+ *
+ * Class for backward compatibility.
+ *
+ * @deprecated Use {@see SimplePie} directly
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Core extends SimplePie
+{
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Core.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieCreditphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Credit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Credit.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Credit.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Credit;
+
+class_exists('SimplePie\Credit');
+
+// @trigger_error(sprintf('Using the "SimplePie_Credit" class is deprecated since SimplePie 1.7.0, use "SimplePie\Credit" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Credit" instead */
+    class SimplePie_Credit extends Credit
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Credit.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieDecodeHTMLEntitiesphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Decode/HTML/Entities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Decode/HTML/Entities.php                                (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Decode/HTML/Entities.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,595 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Decode HTML Entities
+ *
+ * This implements HTML5 as of revision 967 (2007-06-28)
+ *
+ * @deprecated Use DOMDocument instead!
+ * @package SimplePie
+ */
+class SimplePie_Decode_HTML_Entities
+{
+    /**
+     * Data to be parsed
+     *
+     * @access private
+     * @var string
+     */
+    public $data = '';
+
+    /**
+     * Currently consumed bytes
+     *
+     * @access private
+     * @var string
+     */
+    public $consumed = '';
+
+    /**
+     * Position of the current byte being parsed
+     *
+     * @access private
+     * @var int
+     */
+    public $position = 0;
+
+    /**
+     * Create an instance of the class with the input data
+     *
+     * @access public
+     * @param string $data Input data
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Parse the input data
+     *
+     * @access public
+     * @return string Output data
+     */
+    public function parse()
+    {
+        while (($this->position = strpos($this->data, '&', $this->position)) !== false) {
+            $this->consume();
+            $this->entity();
+            $this->consumed = '';
+        }
+        return $this->data;
+    }
+
+    /**
+     * Consume the next byte
+     *
+     * @access private
+     * @return mixed The next byte, or false, if there is no more data
+     */
+    public function consume()
+    {
+        if (isset($this->data[$this->position])) {
+            $this->consumed .= $this->data[$this->position];
+            return $this->data[$this->position++];
+        }
+
+        return false;
+    }
+
+    /**
+     * Consume a range of characters
+     *
+     * @access private
+     * @param string $chars Characters to consume
+     * @return mixed A series of characters that match the range, or false
+     */
+    public function consume_range($chars)
+    {
+        if ($len = strspn($this->data, $chars, $this->position)) {
+            $data = substr($this->data, $this->position, $len);
+            $this->consumed .= $data;
+            $this->position += $len;
+            return $data;
+        }
+
+        return false;
+    }
+
+    /**
+     * Unconsume one byte
+     *
+     * @access private
+     */
+    public function unconsume()
+    {
+        $this->consumed = substr($this->consumed, 0, -1);
+        $this->position--;
+    }
+
+    /**
+     * Decode an entity
+     *
+     * @access private
+     */
+    public function entity()
+    {
+        switch ($this->consume()) {
+            case "\x09":
+            case "\x0A":
+            case "\x0B":
+            case "\x0C":
+            case "\x20":
+            case "\x3C":
+            case "\x26":
+            case false:
+                break;
+
+            case "\x23":
+                switch ($this->consume()) {
+                    case "\x78":
+                    case "\x58":
+                        $range = '0123456789ABCDEFabcdef';
+                        $hex = true;
+                        break;
+
+                    default:
+                        $range = '0123456789';
+                        $hex = false;
+                        $this->unconsume();
+                        break;
+                }
+
+                if ($codepoint = $this->consume_range($range)) {
+                    static $windows_1252_specials = [0x0D => "\x0A", 0x80 => "\xE2\x82\xAC", 0x81 => "\xEF\xBF\xBD", 0x82 => "\xE2\x80\x9A", 0x83 => "\xC6\x92", 0x84 => "\xE2\x80\x9E", 0x85 => "\xE2\x80\xA6", 0x86 => "\xE2\x80\xA0", 0x87 => "\xE2\x80\xA1", 0x88 => "\xCB\x86", 0x89 => "\xE2\x80\xB0", 0x8A => "\xC5\xA0", 0x8B => "\xE2\x80\xB9", 0x8C => "\xC5\x92", 0x8D => "\xEF\xBF\xBD", 0x8E => "\xC5\xBD", 0x8F => "\xEF\xBF\xBD", 0x90 => "\xEF\xBF\xBD", 0x91 => "\xE2\x80\x98", 0x92 => "\xE2\x80\x99", 0x93 => "\xE2\x80\x9C", 0x94 => "\xE2\x80\x9D", 0x95 => "\xE2\x80\xA2", 0x96 => "\xE2\x80\x93", 0x97 => "\xE2\x80\x94", 0x98 => "\xCB\x9C", 0x99 => &qu
 ot;\xE2\x84\xA2", 0x9A => "\xC5\xA1", 0x9B => "\xE2\x80\xBA", 0x9C => "\xC5\x93", 0x9D => "\xEF\xBF\xBD", 0x9E => "\xC5\xBE", 0x9F => "\xC5\xB8"];
+
+                    if ($hex) {
+                        $codepoint = hexdec($codepoint);
+                    } else {
+                        $codepoint = intval($codepoint);
+                    }
+
+                    if (isset($windows_1252_specials[$codepoint])) {
+                        $replacement = $windows_1252_specials[$codepoint];
+                    } else {
+                        $replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
+                    }
+
+                    if (!in_array($this->consume(), [';', false], true)) {
+                        $this->unconsume();
+                    }
+
+                    $consumed_length = strlen($this->consumed);
+                    $this->data = substr_replace($this->data, $replacement, $this->position - $consumed_length, $consumed_length);
+                    $this->position += strlen($replacement) - $consumed_length;
+                }
+                break;
+
+            default:
+                static $entities = [
+                    'Aacute' => "\xC3\x81",
+                    'aacute' => "\xC3\xA1",
+                    'Aacute;' => "\xC3\x81",
+                    'aacute;' => "\xC3\xA1",
+                    'Acirc' => "\xC3\x82",
+                    'acirc' => "\xC3\xA2",
+                    'Acirc;' => "\xC3\x82",
+                    'acirc;' => "\xC3\xA2",
+                    'acute' => "\xC2\xB4",
+                    'acute;' => "\xC2\xB4",
+                    'AElig' => "\xC3\x86",
+                    'aelig' => "\xC3\xA6",
+                    'AElig;' => "\xC3\x86",
+                    'aelig;' => "\xC3\xA6",
+                    'Agrave' => "\xC3\x80",
+                    'agrave' => "\xC3\xA0",
+                    'Agrave;' => "\xC3\x80",
+                    'agrave;' => "\xC3\xA0",
+                    'alefsym;' => "\xE2\x84\xB5",
+                    'Alpha;' => "\xCE\x91",
+                    'alpha;' => "\xCE\xB1",
+                    'AMP' => "\x26",
+                    'amp' => "\x26",
+                    'AMP;' => "\x26",
+                    'amp;' => "\x26",
+                    'and;' => "\xE2\x88\xA7",
+                    'ang;' => "\xE2\x88\xA0",
+                    'apos;' => "\x27",
+                    'Aring' => "\xC3\x85",
+                    'aring' => "\xC3\xA5",
+                    'Aring;' => "\xC3\x85",
+                    'aring;' => "\xC3\xA5",
+                    'asymp;' => "\xE2\x89\x88",
+                    'Atilde' => "\xC3\x83",
+                    'atilde' => "\xC3\xA3",
+                    'Atilde;' => "\xC3\x83",
+                    'atilde;' => "\xC3\xA3",
+                    'Auml' => "\xC3\x84",
+                    'auml' => "\xC3\xA4",
+                    'Auml;' => "\xC3\x84",
+                    'auml;' => "\xC3\xA4",
+                    'bdquo;' => "\xE2\x80\x9E",
+                    'Beta;' => "\xCE\x92",
+                    'beta;' => "\xCE\xB2",
+                    'brvbar' => "\xC2\xA6",
+                    'brvbar;' => "\xC2\xA6",
+                    'bull;' => "\xE2\x80\xA2",
+                    'cap;' => "\xE2\x88\xA9",
+                    'Ccedil' => "\xC3\x87",
+                    'ccedil' => "\xC3\xA7",
+                    'Ccedil;' => "\xC3\x87",
+                    'ccedil;' => "\xC3\xA7",
+                    'cedil' => "\xC2\xB8",
+                    'cedil;' => "\xC2\xB8",
+                    'cent' => "\xC2\xA2",
+                    'cent;' => "\xC2\xA2",
+                    'Chi;' => "\xCE\xA7",
+                    'chi;' => "\xCF\x87",
+                    'circ;' => "\xCB\x86",
+                    'clubs;' => "\xE2\x99\xA3",
+                    'cong;' => "\xE2\x89\x85",
+                    'COPY' => "\xC2\xA9",
+                    'copy' => "\xC2\xA9",
+                    'COPY;' => "\xC2\xA9",
+                    'copy;' => "\xC2\xA9",
+                    'crarr;' => "\xE2\x86\xB5",
+                    'cup;' => "\xE2\x88\xAA",
+                    'curren' => "\xC2\xA4",
+                    'curren;' => "\xC2\xA4",
+                    'Dagger;' => "\xE2\x80\xA1",
+                    'dagger;' => "\xE2\x80\xA0",
+                    'dArr;' => "\xE2\x87\x93",
+                    'darr;' => "\xE2\x86\x93",
+                    'deg' => "\xC2\xB0",
+                    'deg;' => "\xC2\xB0",
+                    'Delta;' => "\xCE\x94",
+                    'delta;' => "\xCE\xB4",
+                    'diams;' => "\xE2\x99\xA6",
+                    'divide' => "\xC3\xB7",
+                    'divide;' => "\xC3\xB7",
+                    'Eacute' => "\xC3\x89",
+                    'eacute' => "\xC3\xA9",
+                    'Eacute;' => "\xC3\x89",
+                    'eacute;' => "\xC3\xA9",
+                    'Ecirc' => "\xC3\x8A",
+                    'ecirc' => "\xC3\xAA",
+                    'Ecirc;' => "\xC3\x8A",
+                    'ecirc;' => "\xC3\xAA",
+                    'Egrave' => "\xC3\x88",
+                    'egrave' => "\xC3\xA8",
+                    'Egrave;' => "\xC3\x88",
+                    'egrave;' => "\xC3\xA8",
+                    'empty;' => "\xE2\x88\x85",
+                    'emsp;' => "\xE2\x80\x83",
+                    'ensp;' => "\xE2\x80\x82",
+                    'Epsilon;' => "\xCE\x95",
+                    'epsilon;' => "\xCE\xB5",
+                    'equiv;' => "\xE2\x89\xA1",
+                    'Eta;' => "\xCE\x97",
+                    'eta;' => "\xCE\xB7",
+                    'ETH' => "\xC3\x90",
+                    'eth' => "\xC3\xB0",
+                    'ETH;' => "\xC3\x90",
+                    'eth;' => "\xC3\xB0",
+                    'Euml' => "\xC3\x8B",
+                    'euml' => "\xC3\xAB",
+                    'Euml;' => "\xC3\x8B",
+                    'euml;' => "\xC3\xAB",
+                    'euro;' => "\xE2\x82\xAC",
+                    'exist;' => "\xE2\x88\x83",
+                    'fnof;' => "\xC6\x92",
+                    'forall;' => "\xE2\x88\x80",
+                    'frac12' => "\xC2\xBD",
+                    'frac12;' => "\xC2\xBD",
+                    'frac14' => "\xC2\xBC",
+                    'frac14;' => "\xC2\xBC",
+                    'frac34' => "\xC2\xBE",
+                    'frac34;' => "\xC2\xBE",
+                    'frasl;' => "\xE2\x81\x84",
+                    'Gamma;' => "\xCE\x93",
+                    'gamma;' => "\xCE\xB3",
+                    'ge;' => "\xE2\x89\xA5",
+                    'GT' => "\x3E",
+                    'gt' => "\x3E",
+                    'GT;' => "\x3E",
+                    'gt;' => "\x3E",
+                    'hArr;' => "\xE2\x87\x94",
+                    'harr;' => "\xE2\x86\x94",
+                    'hearts;' => "\xE2\x99\xA5",
+                    'hellip;' => "\xE2\x80\xA6",
+                    'Iacute' => "\xC3\x8D",
+                    'iacute' => "\xC3\xAD",
+                    'Iacute;' => "\xC3\x8D",
+                    'iacute;' => "\xC3\xAD",
+                    'Icirc' => "\xC3\x8E",
+                    'icirc' => "\xC3\xAE",
+                    'Icirc;' => "\xC3\x8E",
+                    'icirc;' => "\xC3\xAE",
+                    'iexcl' => "\xC2\xA1",
+                    'iexcl;' => "\xC2\xA1",
+                    'Igrave' => "\xC3\x8C",
+                    'igrave' => "\xC3\xAC",
+                    'Igrave;' => "\xC3\x8C",
+                    'igrave;' => "\xC3\xAC",
+                    'image;' => "\xE2\x84\x91",
+                    'infin;' => "\xE2\x88\x9E",
+                    'int;' => "\xE2\x88\xAB",
+                    'Iota;' => "\xCE\x99",
+                    'iota;' => "\xCE\xB9",
+                    'iquest' => "\xC2\xBF",
+                    'iquest;' => "\xC2\xBF",
+                    'isin;' => "\xE2\x88\x88",
+                    'Iuml' => "\xC3\x8F",
+                    'iuml' => "\xC3\xAF",
+                    'Iuml;' => "\xC3\x8F",
+                    'iuml;' => "\xC3\xAF",
+                    'Kappa;' => "\xCE\x9A",
+                    'kappa;' => "\xCE\xBA",
+                    'Lambda;' => "\xCE\x9B",
+                    'lambda;' => "\xCE\xBB",
+                    'lang;' => "\xE3\x80\x88",
+                    'laquo' => "\xC2\xAB",
+                    'laquo;' => "\xC2\xAB",
+                    'lArr;' => "\xE2\x87\x90",
+                    'larr;' => "\xE2\x86\x90",
+                    'lceil;' => "\xE2\x8C\x88",
+                    'ldquo;' => "\xE2\x80\x9C",
+                    'le;' => "\xE2\x89\xA4",
+                    'lfloor;' => "\xE2\x8C\x8A",
+                    'lowast;' => "\xE2\x88\x97",
+                    'loz;' => "\xE2\x97\x8A",
+                    'lrm;' => "\xE2\x80\x8E",
+                    'lsaquo;' => "\xE2\x80\xB9",
+                    'lsquo;' => "\xE2\x80\x98",
+                    'LT' => "\x3C",
+                    'lt' => "\x3C",
+                    'LT;' => "\x3C",
+                    'lt;' => "\x3C",
+                    'macr' => "\xC2\xAF",
+                    'macr;' => "\xC2\xAF",
+                    'mdash;' => "\xE2\x80\x94",
+                    'micro' => "\xC2\xB5",
+                    'micro;' => "\xC2\xB5",
+                    'middot' => "\xC2\xB7",
+                    'middot;' => "\xC2\xB7",
+                    'minus;' => "\xE2\x88\x92",
+                    'Mu;' => "\xCE\x9C",
+                    'mu;' => "\xCE\xBC",
+                    'nabla;' => "\xE2\x88\x87",
+                    'nbsp' => "\xC2\xA0",
+                    'nbsp;' => "\xC2\xA0",
+                    'ndash;' => "\xE2\x80\x93",
+                    'ne;' => "\xE2\x89\xA0",
+                    'ni;' => "\xE2\x88\x8B",
+                    'not' => "\xC2\xAC",
+                    'not;' => "\xC2\xAC",
+                    'notin;' => "\xE2\x88\x89",
+                    'nsub;' => "\xE2\x8A\x84",
+                    'Ntilde' => "\xC3\x91",
+                    'ntilde' => "\xC3\xB1",
+                    'Ntilde;' => "\xC3\x91",
+                    'ntilde;' => "\xC3\xB1",
+                    'Nu;' => "\xCE\x9D",
+                    'nu;' => "\xCE\xBD",
+                    'Oacute' => "\xC3\x93",
+                    'oacute' => "\xC3\xB3",
+                    'Oacute;' => "\xC3\x93",
+                    'oacute;' => "\xC3\xB3",
+                    'Ocirc' => "\xC3\x94",
+                    'ocirc' => "\xC3\xB4",
+                    'Ocirc;' => "\xC3\x94",
+                    'ocirc;' => "\xC3\xB4",
+                    'OElig;' => "\xC5\x92",
+                    'oelig;' => "\xC5\x93",
+                    'Ograve' => "\xC3\x92",
+                    'ograve' => "\xC3\xB2",
+                    'Ograve;' => "\xC3\x92",
+                    'ograve;' => "\xC3\xB2",
+                    'oline;' => "\xE2\x80\xBE",
+                    'Omega;' => "\xCE\xA9",
+                    'omega;' => "\xCF\x89",
+                    'Omicron;' => "\xCE\x9F",
+                    'omicron;' => "\xCE\xBF",
+                    'oplus;' => "\xE2\x8A\x95",
+                    'or;' => "\xE2\x88\xA8",
+                    'ordf' => "\xC2\xAA",
+                    'ordf;' => "\xC2\xAA",
+                    'ordm' => "\xC2\xBA",
+                    'ordm;' => "\xC2\xBA",
+                    'Oslash' => "\xC3\x98",
+                    'oslash' => "\xC3\xB8",
+                    'Oslash;' => "\xC3\x98",
+                    'oslash;' => "\xC3\xB8",
+                    'Otilde' => "\xC3\x95",
+                    'otilde' => "\xC3\xB5",
+                    'Otilde;' => "\xC3\x95",
+                    'otilde;' => "\xC3\xB5",
+                    'otimes;' => "\xE2\x8A\x97",
+                    'Ouml' => "\xC3\x96",
+                    'ouml' => "\xC3\xB6",
+                    'Ouml;' => "\xC3\x96",
+                    'ouml;' => "\xC3\xB6",
+                    'para' => "\xC2\xB6",
+                    'para;' => "\xC2\xB6",
+                    'part;' => "\xE2\x88\x82",
+                    'permil;' => "\xE2\x80\xB0",
+                    'perp;' => "\xE2\x8A\xA5",
+                    'Phi;' => "\xCE\xA6",
+                    'phi;' => "\xCF\x86",
+                    'Pi;' => "\xCE\xA0",
+                    'pi;' => "\xCF\x80",
+                    'piv;' => "\xCF\x96",
+                    'plusmn' => "\xC2\xB1",
+                    'plusmn;' => "\xC2\xB1",
+                    'pound' => "\xC2\xA3",
+                    'pound;' => "\xC2\xA3",
+                    'Prime;' => "\xE2\x80\xB3",
+                    'prime;' => "\xE2\x80\xB2",
+                    'prod;' => "\xE2\x88\x8F",
+                    'prop;' => "\xE2\x88\x9D",
+                    'Psi;' => "\xCE\xA8",
+                    'psi;' => "\xCF\x88",
+                    'QUOT' => "\x22",
+                    'quot' => "\x22",
+                    'QUOT;' => "\x22",
+                    'quot;' => "\x22",
+                    'radic;' => "\xE2\x88\x9A",
+                    'rang;' => "\xE3\x80\x89",
+                    'raquo' => "\xC2\xBB",
+                    'raquo;' => "\xC2\xBB",
+                    'rArr;' => "\xE2\x87\x92",
+                    'rarr;' => "\xE2\x86\x92",
+                    'rceil;' => "\xE2\x8C\x89",
+                    'rdquo;' => "\xE2\x80\x9D",
+                    'real;' => "\xE2\x84\x9C",
+                    'REG' => "\xC2\xAE",
+                    'reg' => "\xC2\xAE",
+                    'REG;' => "\xC2\xAE",
+                    'reg;' => "\xC2\xAE",
+                    'rfloor;' => "\xE2\x8C\x8B",
+                    'Rho;' => "\xCE\xA1",
+                    'rho;' => "\xCF\x81",
+                    'rlm;' => "\xE2\x80\x8F",
+                    'rsaquo;' => "\xE2\x80\xBA",
+                    'rsquo;' => "\xE2\x80\x99",
+                    'sbquo;' => "\xE2\x80\x9A",
+                    'Scaron;' => "\xC5\xA0",
+                    'scaron;' => "\xC5\xA1",
+                    'sdot;' => "\xE2\x8B\x85",
+                    'sect' => "\xC2\xA7",
+                    'sect;' => "\xC2\xA7",
+                    'shy' => "\xC2\xAD",
+                    'shy;' => "\xC2\xAD",
+                    'Sigma;' => "\xCE\xA3",
+                    'sigma;' => "\xCF\x83",
+                    'sigmaf;' => "\xCF\x82",
+                    'sim;' => "\xE2\x88\xBC",
+                    'spades;' => "\xE2\x99\xA0",
+                    'sub;' => "\xE2\x8A\x82",
+                    'sube;' => "\xE2\x8A\x86",
+                    'sum;' => "\xE2\x88\x91",
+                    'sup;' => "\xE2\x8A\x83",
+                    'sup1' => "\xC2\xB9",
+                    'sup1;' => "\xC2\xB9",
+                    'sup2' => "\xC2\xB2",
+                    'sup2;' => "\xC2\xB2",
+                    'sup3' => "\xC2\xB3",
+                    'sup3;' => "\xC2\xB3",
+                    'supe;' => "\xE2\x8A\x87",
+                    'szlig' => "\xC3\x9F",
+                    'szlig;' => "\xC3\x9F",
+                    'Tau;' => "\xCE\xA4",
+                    'tau;' => "\xCF\x84",
+                    'there4;' => "\xE2\x88\xB4",
+                    'Theta;' => "\xCE\x98",
+                    'theta;' => "\xCE\xB8",
+                    'thetasym;' => "\xCF\x91",
+                    'thinsp;' => "\xE2\x80\x89",
+                    'THORN' => "\xC3\x9E",
+                    'thorn' => "\xC3\xBE",
+                    'THORN;' => "\xC3\x9E",
+                    'thorn;' => "\xC3\xBE",
+                    'tilde;' => "\xCB\x9C",
+                    'times' => "\xC3\x97",
+                    'times;' => "\xC3\x97",
+                    'TRADE;' => "\xE2\x84\xA2",
+                    'trade;' => "\xE2\x84\xA2",
+                    'Uacute' => "\xC3\x9A",
+                    'uacute' => "\xC3\xBA",
+                    'Uacute;' => "\xC3\x9A",
+                    'uacute;' => "\xC3\xBA",
+                    'uArr;' => "\xE2\x87\x91",
+                    'uarr;' => "\xE2\x86\x91",
+                    'Ucirc' => "\xC3\x9B",
+                    'ucirc' => "\xC3\xBB",
+                    'Ucirc;' => "\xC3\x9B",
+                    'ucirc;' => "\xC3\xBB",
+                    'Ugrave' => "\xC3\x99",
+                    'ugrave' => "\xC3\xB9",
+                    'Ugrave;' => "\xC3\x99",
+                    'ugrave;' => "\xC3\xB9",
+                    'uml' => "\xC2\xA8",
+                    'uml;' => "\xC2\xA8",
+                    'upsih;' => "\xCF\x92",
+                    'Upsilon;' => "\xCE\xA5",
+                    'upsilon;' => "\xCF\x85",
+                    'Uuml' => "\xC3\x9C",
+                    'uuml' => "\xC3\xBC",
+                    'Uuml;' => "\xC3\x9C",
+                    'uuml;' => "\xC3\xBC",
+                    'weierp;' => "\xE2\x84\x98",
+                    'Xi;' => "\xCE\x9E",
+                    'xi;' => "\xCE\xBE",
+                    'Yacute' => "\xC3\x9D",
+                    'yacute' => "\xC3\xBD",
+                    'Yacute;' => "\xC3\x9D",
+                    'yacute;' => "\xC3\xBD",
+                    'yen' => "\xC2\xA5",
+                    'yen;' => "\xC2\xA5",
+                    'yuml' => "\xC3\xBF",
+                    'Yuml;' => "\xC5\xB8",
+                    'yuml;' => "\xC3\xBF",
+                    'Zeta;' => "\xCE\x96",
+                    'zeta;' => "\xCE\xB6",
+                    'zwj;' => "\xE2\x80\x8D",
+                    'zwnj;' => "\xE2\x80\x8C"
+                ];
+
+                for ($i = 0, $match = null; $i < 9 && $this->consume() !== false; $i++) {
+                    $consumed = substr($this->consumed, 1);
+                    if (isset($entities[$consumed])) {
+                        $match = $consumed;
+                    }
+                }
+
+                if ($match !== null) {
+                    $this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1);
+                    $this->position += strlen($entities[$match]) - strlen($consumed) - 1;
+                }
+                break;
+        }
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Decode/HTML/Entities.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieEnclosurephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Enclosure.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Enclosure.php                           (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Enclosure.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Enclosure;
+
+class_exists('SimplePie\Enclosure');
+
+// @trigger_error(sprintf('Using the "SimplePie_Enclosure" class is deprecated since SimplePie 1.7.0, use "SimplePie\Enclosure" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Enclosure" instead */
+    class SimplePie_Enclosure extends Enclosure
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Enclosure.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieExceptionphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Exception.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Exception.php                           (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Exception.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Exception as SimplePieException;
+
+class_exists('SimplePie\Exception');
+
+// @trigger_error(sprintf('Using the "SimplePie_Exception" class is deprecated since SimplePie 1.7.0, use "SimplePie\Exception" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Exception" instead */
+    class SimplePie_Exception extends SimplePieException
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Exception.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieFilephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/File.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/File.php                                (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/File.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\File;
+
+class_exists('SimplePie\File');
+
+// @trigger_error(sprintf('Using the "SimplePie_File" class is deprecated since SimplePie 1.7.0, use "SimplePie\File" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\File" instead */
+    class SimplePie_File extends File
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/File.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieHTTPParserphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/HTTP/Parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/HTTP/Parser.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/HTTP/Parser.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\HTTP\Parser;
+
+class_exists('SimplePie\HTTP\Parser');
+
+// @trigger_error(sprintf('Using the "SimplePie_HTTP_Parser" class is deprecated since SimplePie 1.7.0, use "SimplePie\HTTP\Parser" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\HTTP\Parser" instead */
+    class SimplePie_HTTP_Parser extends Parser
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/HTTP/Parser.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieIRIphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/IRI.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/IRI.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/IRI.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\IRI;
+
+class_exists('SimplePie\IRI');
+
+// @trigger_error(sprintf('Using the "SimplePie_IRI" class is deprecated since SimplePie 1.7.0, use "SimplePie\IRI" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\IRI" instead */
+    class SimplePie_IRI extends IRI
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/IRI.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieItemphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Item.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Item.php                                (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Item.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Item;
+
+class_exists('SimplePie\Item');
+
+// @trigger_error(sprintf('Using the "SimplePie_Item" class is deprecated since SimplePie 1.7.0, use "SimplePie\Item" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Item" instead */
+    class SimplePie_Item extends Item
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Item.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieLocatorphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Locator.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Locator.php                             (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Locator.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Locator;
+
+class_exists('SimplePie\Locator');
+
+// @trigger_error(sprintf('Using the "SimplePie_Locator" class is deprecated since SimplePie 1.7.0, use "SimplePie\Locator" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Locator" instead */
+    class SimplePie_Locator extends Locator
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Locator.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieMiscphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Misc.php                                (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Misc.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Misc;
+
+class_exists('SimplePie\Misc');
+
+// @trigger_error(sprintf('Using the "SimplePie_Misc" class is deprecated since SimplePie 1.7.0, use "SimplePie\Misc" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Misc" instead */
+    class SimplePie_Misc extends Misc
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Misc.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieNetIPv6php"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Net/IPv6.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Net/IPv6.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Net/IPv6.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Net\IPv6;
+
+class_exists('SimplePie\Net\IPv6');
+
+// @trigger_error(sprintf('Using the "SimplePie_Net_IPv6" class is deprecated since SimplePie 1.7.0, use "SimplePie\Net\IPv6" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Net\IPv6" instead */
+    class SimplePie_Net_IPv6 extends IPv6
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Net/IPv6.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieParseDatephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Parse/Date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Parse/Date.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Parse/Date.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Parse\Date;
+
+class_exists('SimplePie\Parse\Date');
+
+// @trigger_error(sprintf('Using the "SimplePie_Parse_Date" class is deprecated since SimplePie 1.7.0, use "SimplePie\Parse\Date" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Parse\Date" instead */
+    class SimplePie_Parse_Date extends Date
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Parse/Date.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieParserphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Parser.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Parser.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Parser;
+
+class_exists('SimplePie\Parser');
+
+// @trigger_error(sprintf('Using the "SimplePie_Parser" class is deprecated since SimplePie 1.7.0, use "SimplePie\Parser" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Parser" instead */
+    class SimplePie_Parser extends Parser
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Parser.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieRatingphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Rating.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Rating.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Rating.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Rating;
+
+class_exists('SimplePie\Rating');
+
+// @trigger_error(sprintf('Using the "SimplePie_Rating" class is deprecated since SimplePie 1.7.0, use "SimplePie\Rating" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Rating" instead */
+    class SimplePie_Rating extends Rating
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Rating.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieRegistryphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Registry.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Registry.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Registry;
+
+class_exists('SimplePie\Registry');
+
+// @trigger_error(sprintf('Using the "SimplePie_Registry" class is deprecated since SimplePie 1.7.0, use "SimplePie\Registry" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Registry" instead */
+    class SimplePie_Registry extends Registry
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Registry.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieRestrictionphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Restriction.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Restriction.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Restriction.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Restriction;
+
+class_exists('SimplePie\Restriction');
+
+// @trigger_error(sprintf('Using the "SimplePie_Restriction" class is deprecated since SimplePie 1.7.0, use "SimplePie\Restriction" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Restriction" instead */
+    class SimplePie_Restriction extends Restriction
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Restriction.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieSanitizephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Sanitize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Sanitize.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Sanitize.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Sanitize;
+
+class_exists('SimplePie\Sanitize');
+
+// @trigger_error(sprintf('Using the "SimplePie_Sanitize" class is deprecated since SimplePie 1.7.0, use "SimplePie\Sanitize" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Sanitize" instead */
+    class SimplePie_Sanitize extends Sanitize
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Sanitize.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieSourcephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/Source.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/Source.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/Source.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Source;
+
+class_exists('SimplePie\Source');
+
+// @trigger_error(sprintf('Using the "SimplePie_Source" class is deprecated since SimplePie 1.7.0, use "SimplePie\Source" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Source" instead */
+    class SimplePie_Source extends Source
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/Source.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePieXMLDeclarationParserphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/XML/Declaration/Parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/XML/Declaration/Parser.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/XML/Declaration/Parser.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\XML\Declaration\Parser;
+
+class_exists('SimplePie\XML\Declaration\Parser');
+
+// @trigger_error(sprintf('Using the "SimplePie_XML_Declaration_Parser" class is deprecated since SimplePie 1.7.0, use "SimplePie\XML\Declaration\Parser" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\XML\Declaration\Parser" instead */
+    class SimplePie_XML_Declaration_Parser extends Parser
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/XML/Declaration/Parser.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePiegzdecodephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie/gzdecode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie/gzdecode.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie/gzdecode.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\Gzdecode;
+
+class_exists('SimplePie\Gzdecode');
+
+// @trigger_error(sprintf('Using the "SimplePie_gzdecode" class is deprecated since SimplePie 1.7.0, use "SimplePie\Gzdecode" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\Gzdecode" instead */
+    class SimplePie_gzdecode extends Gzdecode
+    {
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie/gzdecode.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePielibrarySimplePiephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/library/SimplePie.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/library/SimplePie.php                             (rev 0)
+++ trunk/src/wp-includes/SimplePie/library/SimplePie.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,487 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2017, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.7.0
+ * @copyright 2004-2017 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+use SimplePie\SimplePie as NamespacedSimplePie;
+
+class_exists('SimplePie\SimplePie');
+
+// @trigger_error(sprintf('Using the "SimplePie" class is deprecated since SimplePie 1.7.0, use "SimplePie\SimplePie" instead.'), \E_USER_DEPRECATED);
+
+if (\false) {
+    /** @deprecated since SimplePie 1.7.0, use "SimplePie\SimplePie" instead */
+    class SimplePie extends NamespacedSimplePie
+    {
+    }
+}
+
+/**
+ * SimplePie Name
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAME instead.
+ */
+define('SIMPLEPIE_NAME', NamespacedSimplePie::NAME);
+
+/**
+ * SimplePie Version
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::VERSION instead.
+ */
+define('SIMPLEPIE_VERSION', NamespacedSimplePie::VERSION);
+
+/**
+ * SimplePie Build
+ * @todo Hardcode for release (there's no need to have to call SimplePie_Misc::get_build() only every load of simplepie.inc)
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\Misc::get_build() instead.
+ */
+define('SIMPLEPIE_BUILD', gmdate('YmdHis', \SimplePie\Misc::get_build()));
+
+/**
+ * SimplePie Website URL
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::URL instead.
+ */
+define('SIMPLEPIE_URL', NamespacedSimplePie::URL);
+
+/**
+ * SimplePie Useragent
+ * @see SimplePie::set_useragent()
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\Misc::get_default_useragent() instead.
+ */
+define('SIMPLEPIE_USERAGENT', \SimplePie\Misc::get_default_useragent());
+
+/**
+ * SimplePie Linkback
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LINKBACK instead.
+ */
+define('SIMPLEPIE_LINKBACK', NamespacedSimplePie::LINKBACK);
+
+/**
+ * No Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LOCATOR_NONE instead.
+ */
+define('SIMPLEPIE_LOCATOR_NONE', NamespacedSimplePie::LOCATOR_NONE);
+
+/**
+ * Feed Link Element Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LOCATOR_AUTODISCOVERY instead.
+ */
+define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', NamespacedSimplePie::LOCATOR_AUTODISCOVERY);
+
+/**
+ * Local Feed Extension Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LOCATOR_LOCAL_EXTENSION instead.
+ */
+define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', NamespacedSimplePie::LOCATOR_LOCAL_EXTENSION);
+
+/**
+ * Local Feed Body Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LOCATOR_LOCAL_BODY instead.
+ */
+define('SIMPLEPIE_LOCATOR_LOCAL_BODY', NamespacedSimplePie::LOCATOR_LOCAL_BODY);
+
+/**
+ * Remote Feed Extension Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LOCATOR_REMOTE_EXTENSION instead.
+ */
+define('SIMPLEPIE_LOCATOR_REMOTE_EXTENSION', NamespacedSimplePie::LOCATOR_REMOTE_EXTENSION);
+
+/**
+ * Remote Feed Body Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LOCATOR_REMOTE_BODY instead.
+ */
+define('SIMPLEPIE_LOCATOR_REMOTE_BODY', NamespacedSimplePie::LOCATOR_REMOTE_BODY);
+
+/**
+ * All Feed Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LOCATOR_ALL instead.
+ */
+define('SIMPLEPIE_LOCATOR_ALL', NamespacedSimplePie::LOCATOR_ALL);
+
+/**
+ * No known feed type
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_NONE instead.
+ */
+define('SIMPLEPIE_TYPE_NONE', NamespacedSimplePie::TYPE_NONE);
+
+/**
+ * RSS 0.90
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_090 instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_090', NamespacedSimplePie::TYPE_RSS_090);
+
+/**
+ * RSS 0.91 (Netscape)
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_091_NETSCAPE instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_091_NETSCAPE', NamespacedSimplePie::TYPE_RSS_091_NETSCAPE);
+
+/**
+ * RSS 0.91 (Userland)
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_091_USERLAND instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_091_USERLAND', NamespacedSimplePie::TYPE_RSS_091_USERLAND);
+
+/**
+ * RSS 0.91 (both Netscape and Userland)
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_091 instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_091', NamespacedSimplePie::TYPE_RSS_091);
+
+/**
+ * RSS 0.92
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_092 instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_092', NamespacedSimplePie::TYPE_RSS_092);
+
+/**
+ * RSS 0.93
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_093 instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_093', NamespacedSimplePie::TYPE_RSS_093);
+
+/**
+ * RSS 0.94
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_094 instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_094', NamespacedSimplePie::TYPE_RSS_094);
+
+/**
+ * RSS 1.0
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_10 instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_10', NamespacedSimplePie::TYPE_RSS_10);
+
+/**
+ * RSS 2.0
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_20 instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_20', NamespacedSimplePie::TYPE_RSS_20);
+
+/**
+ * RDF-based RSS
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_RDF instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_RDF', NamespacedSimplePie::TYPE_RSS_RDF);
+
+/**
+ * Non-RDF-based RSS (truly intended as syndication format)
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_SYNDICATION instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_SYNDICATION', NamespacedSimplePie::TYPE_RSS_SYNDICATION);
+
+/**
+ * All RSS
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_RSS_ALL instead.
+ */
+define('SIMPLEPIE_TYPE_RSS_ALL', NamespacedSimplePie::TYPE_RSS_ALL);
+
+/**
+ * Atom 0.3
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_ATOM_03 instead.
+ */
+define('SIMPLEPIE_TYPE_ATOM_03', NamespacedSimplePie::TYPE_ATOM_03);
+
+/**
+ * Atom 1.0
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_ATOM_10 instead.
+ */
+define('SIMPLEPIE_TYPE_ATOM_10', NamespacedSimplePie::TYPE_ATOM_10);
+
+/**
+ * All Atom
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_ATOM_ALL instead.
+ */
+define('SIMPLEPIE_TYPE_ATOM_ALL', NamespacedSimplePie::TYPE_ATOM_ALL);
+
+/**
+ * All feed types
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::TYPE_ALL instead.
+ */
+define('SIMPLEPIE_TYPE_ALL', NamespacedSimplePie::TYPE_ALL);
+
+/**
+ * No construct
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::CONSTRUCT_NONE instead.
+ */
+define('SIMPLEPIE_CONSTRUCT_NONE', NamespacedSimplePie::CONSTRUCT_NONE);
+
+/**
+ * Text construct
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::CONSTRUCT_TEXT instead.
+ */
+define('SIMPLEPIE_CONSTRUCT_TEXT', NamespacedSimplePie::CONSTRUCT_TEXT);
+
+/**
+ * HTML construct
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::CONSTRUCT_HTML instead.
+ */
+define('SIMPLEPIE_CONSTRUCT_HTML', NamespacedSimplePie::CONSTRUCT_HTML);
+
+/**
+ * XHTML construct
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::CONSTRUCT_XHTML instead.
+ */
+define('SIMPLEPIE_CONSTRUCT_XHTML', NamespacedSimplePie::CONSTRUCT_XHTML);
+
+/**
+ * base64-encoded construct
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::CONSTRUCT_BASE64 instead.
+ */
+define('SIMPLEPIE_CONSTRUCT_BASE64', NamespacedSimplePie::CONSTRUCT_BASE64);
+
+/**
+ * IRI construct
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::CONSTRUCT_IRI instead.
+ */
+define('SIMPLEPIE_CONSTRUCT_IRI', NamespacedSimplePie::CONSTRUCT_IRI);
+
+/**
+ * A construct that might be HTML
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML instead.
+ */
+define('SIMPLEPIE_CONSTRUCT_MAYBE_HTML', NamespacedSimplePie::CONSTRUCT_MAYBE_HTML);
+
+/**
+ * All constructs
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::CONSTRUCT_ALL instead.
+ */
+define('SIMPLEPIE_CONSTRUCT_ALL', NamespacedSimplePie::CONSTRUCT_ALL);
+
+/**
+ * Don't change case
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::SAME_CASE instead.
+ */
+define('SIMPLEPIE_SAME_CASE', NamespacedSimplePie::SAME_CASE);
+
+/**
+ * Change to lowercase
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::LOWERCASE instead.
+ */
+define('SIMPLEPIE_LOWERCASE', NamespacedSimplePie::LOWERCASE);
+
+/**
+ * Change to uppercase
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::UPPERCASE instead.
+ */
+define('SIMPLEPIE_UPPERCASE', NamespacedSimplePie::UPPERCASE);
+
+/**
+ * PCRE for HTML attributes
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::PCRE_HTML_ATTRIBUTE instead.
+ */
+define('SIMPLEPIE_PCRE_HTML_ATTRIBUTE', NamespacedSimplePie::PCRE_HTML_ATTRIBUTE);
+
+/**
+ * PCRE for XML attributes
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::PCRE_XML_ATTRIBUTE instead.
+ */
+define('SIMPLEPIE_PCRE_XML_ATTRIBUTE', NamespacedSimplePie::PCRE_XML_ATTRIBUTE);
+
+/**
+ * XML Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_XML instead.
+ */
+define('SIMPLEPIE_NAMESPACE_XML', NamespacedSimplePie::NAMESPACE_XML);
+
+/**
+ * Atom 1.0 Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_ATOM_10 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_ATOM_10', NamespacedSimplePie::NAMESPACE_ATOM_10);
+
+/**
+ * Atom 0.3 Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_ATOM_03 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_ATOM_03', NamespacedSimplePie::NAMESPACE_ATOM_03);
+
+/**
+ * RDF Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_RDF instead.
+ */
+define('SIMPLEPIE_NAMESPACE_RDF', NamespacedSimplePie::NAMESPACE_RDF);
+
+/**
+ * RSS 0.90 Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_RSS_090 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_090', NamespacedSimplePie::NAMESPACE_RSS_090);
+
+/**
+ * RSS 1.0 Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_RSS_10 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_10', NamespacedSimplePie::NAMESPACE_RSS_10);
+
+/**
+ * RSS 1.0 Content Module Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_RSS_10_MODULES_CONTENT instead.
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT', NamespacedSimplePie::NAMESPACE_RSS_10_MODULES_CONTENT);
+
+/**
+ * RSS 2.0 Namespace
+ * (Stupid, I know, but I'm certain it will confuse people less with support.)
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_RSS_20 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_20', NamespacedSimplePie::NAMESPACE_RSS_20);
+
+/**
+ * DC 1.0 Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_DC_10 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_DC_10', NamespacedSimplePie::NAMESPACE_DC_10);
+
+/**
+ * DC 1.1 Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_DC_11 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_DC_11', NamespacedSimplePie::NAMESPACE_DC_11);
+
+/**
+ * W3C Basic Geo (WGS84 lat/long) Vocabulary Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_W3C_BASIC_GEO instead.
+ */
+define('SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO', NamespacedSimplePie::NAMESPACE_W3C_BASIC_GEO);
+
+/**
+ * GeoRSS Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_GEORSS instead.
+ */
+define('SIMPLEPIE_NAMESPACE_GEORSS', NamespacedSimplePie::NAMESPACE_GEORSS);
+
+/**
+ * Media RSS Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_MEDIARSS instead.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS', NamespacedSimplePie::NAMESPACE_MEDIARSS);
+
+/**
+ * Wrong Media RSS Namespace. Caused by a long-standing typo in the spec.
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG instead.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG', NamespacedSimplePie::NAMESPACE_MEDIARSS_WRONG);
+
+/**
+ * Wrong Media RSS Namespace #2. New namespace introduced in Media RSS 1.5.
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG2 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2', NamespacedSimplePie::NAMESPACE_MEDIARSS_WRONG2);
+
+/**
+ * Wrong Media RSS Namespace #3. A possible typo of the Media RSS 1.5 namespace.
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG3 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3', NamespacedSimplePie::NAMESPACE_MEDIARSS_WRONG3);
+
+/**
+ * Wrong Media RSS Namespace #4. New spec location after the RSS Advisory Board takes it over, but not a valid namespace.
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG4 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4', NamespacedSimplePie::NAMESPACE_MEDIARSS_WRONG4);
+
+/**
+ * Wrong Media RSS Namespace #5. A possible typo of the RSS Advisory Board URL.
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG5 instead.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5', NamespacedSimplePie::NAMESPACE_MEDIARSS_WRONG5);
+
+/**
+ * iTunes RSS Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_ITUNES instead.
+ */
+define('SIMPLEPIE_NAMESPACE_ITUNES', NamespacedSimplePie::NAMESPACE_ITUNES);
+
+/**
+ * XHTML Namespace
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::NAMESPACE_XHTML instead.
+ */
+define('SIMPLEPIE_NAMESPACE_XHTML', NamespacedSimplePie::NAMESPACE_XHTML);
+
+/**
+ * IANA Link Relations Registry
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY instead.
+ */
+define('SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY', NamespacedSimplePie::IANA_LINK_RELATIONS_REGISTRY);
+
+/**
+ * No file source
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::FILE_SOURCE_NONE instead.
+ */
+define('SIMPLEPIE_FILE_SOURCE_NONE', NamespacedSimplePie::FILE_SOURCE_NONE);
+
+/**
+ * Remote file source
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::FILE_SOURCE_REMOTE instead.
+ */
+define('SIMPLEPIE_FILE_SOURCE_REMOTE', NamespacedSimplePie::FILE_SOURCE_REMOTE);
+
+/**
+ * Local file source
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::FILE_SOURCE_LOCAL instead.
+ */
+define('SIMPLEPIE_FILE_SOURCE_LOCAL', NamespacedSimplePie::FILE_SOURCE_LOCAL);
+
+/**
+ * fsockopen() file source
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::FILE_SOURCE_FSOCKOPEN instead.
+ */
+define('SIMPLEPIE_FILE_SOURCE_FSOCKOPEN', NamespacedSimplePie::FILE_SOURCE_FSOCKOPEN);
+
+/**
+ * cURL file source
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::FILE_SOURCE_CURL instead.
+ */
+define('SIMPLEPIE_FILE_SOURCE_CURL', NamespacedSimplePie::FILE_SOURCE_CURL);
+
+/**
+ * file_get_contents() file source
+ * @deprecated since SimplePie 1.7.0, use \SimplePie\SimplePie::FILE_SOURCE_FILE_GET_CONTENTS instead.
+ */
+define('SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS', NamespacedSimplePie::FILE_SOURCE_FILE_GET_CONTENTS);
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/library/SimplePie.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePiesrcAuthorphpfromrev59140trunksrcwpincludesSimplePieAuthorphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Author.php (from rev 59140, trunk/src/wp-includes/SimplePie/Author.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Author.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Author.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,151 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Manages all author-related data
+ *
+ * Used by {@see Item::get_author()} and {@see SimplePie::get_authors()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_author_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Author
+{
+    /**
+     * Author's name
+     *
+     * @var string
+     * @see get_name()
+     */
+    public $name;
+
+    /**
+     * Author's link
+     *
+     * @var string
+     * @see get_link()
+     */
+    public $link;
+
+    /**
+     * Author's email address
+     *
+     * @var string
+     * @see get_email()
+     */
+    public $email;
+
+    /**
+     * Constructor, used to input the data
+     *
+     * @param string $name
+     * @param string $link
+     * @param string $email
+     */
+    public function __construct($name = null, $link = null, $email = null)
+    {
+        $this->name = $name;
+        $this->link = $link;
+        $this->email = $email;
+    }
+
+    /**
+     * String-ified version
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        // There is no $this->data here
+        return md5(serialize($this));
+    }
+
+    /**
+     * Author's name
+     *
+     * @return string|null
+     */
+    public function get_name()
+    {
+        if ($this->name !== null) {
+            return $this->name;
+        }
+
+        return null;
+    }
+
+    /**
+     * Author's link
+     *
+     * @return string|null
+     */
+    public function get_link()
+    {
+        if ($this->link !== null) {
+            return $this->link;
+        }
+
+        return null;
+    }
+
+    /**
+     * Author's email address
+     *
+     * @return string|null
+     */
+    public function get_email()
+    {
+        if ($this->email !== null) {
+            return $this->email;
+        }
+
+        return null;
+    }
+}
+
+class_alias('SimplePie\Author', 'SimplePie_Author');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCacheBasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Cache/Base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Cache/Base.php    2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Cache/Base.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,73 +42,78 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Cache;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Base for cache objects
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Classes to be used with {@see SimplePie_Cache::register()} are expected
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Classes to be used with {@see \SimplePie\Cache::register()} are expected
</ins><span class="cx" style="display: block; padding: 0 10px">  * to implement this interface.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Caching
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated since SimplePie 1.8.0, use "Psr\SimpleCache\CacheInterface" instead
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-interface SimplePie_Cache_Base
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+interface Base
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Feed cache type
-        *
-        * @var string
-        */
-       const TYPE_FEED = 'spc';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Feed cache type
+     *
+     * @var string
+     */
+    public const TYPE_FEED = 'spc';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Image cache type
-        *
-        * @var string
-        */
-       const TYPE_IMAGE = 'spi';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Image cache type
+     *
+     * @var string
+     */
+    public const TYPE_IMAGE = 'spi';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create a new cache object
-        *
-        * @param string $location Location string (from SimplePie::$cache_location)
-        * @param string $name Unique ID for the cache
-        * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
-        */
-       public function __construct($location, $name, $type);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Create a new cache object
+     *
+     * @param string $location Location string (from SimplePie::$cache_location)
+     * @param string $name Unique ID for the cache
+     * @param Base::TYPE_FEED|Base::TYPE_IMAGE $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+     */
+    public function __construct($location, $name, $type);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Save data to the cache
-        *
-        * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
-        * @return bool Successfulness
-        */
-       public function save($data);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Save data to the cache
+     *
+     * @param array|\SimplePie\SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+     * @return bool Successfulness
+     */
+    public function save($data);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Retrieve the data saved to the cache
-        *
-        * @return array Data for SimplePie::$data
-        */
-       public function load();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Retrieve the data saved to the cache
+     *
+     * @return array Data for SimplePie::$data
+     */
+    public function load();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Retrieve the last modified time for the cache
-        *
-        * @return int Timestamp
-        */
-       public function mtime();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Retrieve the last modified time for the cache
+     *
+     * @return int Timestamp
+     */
+    public function mtime();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Set the last modified time to the current time
-        *
-        * @return bool Success status
-        */
-       public function touch();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Set the last modified time to the current time
+     *
+     * @return bool Success status
+     */
+    public function touch();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Remove the cache
-        *
-        * @return bool Success status
-        */
-       public function unlink();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Remove the cache
+     *
+     * @return bool Success status
+     */
+    public function unlink();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\Cache\Base', 'SimplePie_Cache_Base');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCacheBaseDataCachephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/src/Cache/BaseDataCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Cache/BaseDataCache.php                               (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Cache/BaseDataCache.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,158 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2022 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+use InvalidArgumentException;
+
+/**
+ * Adapter for deprecated \SimplePie\Cache\Base implementations
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ * @internal
+ */
+final class BaseDataCache implements DataCache
+{
+    /**
+     * @var Base
+     */
+    private $cache;
+
+    public function __construct(Base $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Fetches a value from the cache.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::get()
+     * <code>
+     * public function get(string $key, mixed $default = null): mixed;
+     * </code>
+     *
+     * @param string $key     The unique key of this item in the cache.
+     * @param mixed  $default Default value to return if the key does not exist.
+     *
+     * @return array|mixed The value of the item from the cache, or $default in case of cache miss.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function get_data(string $key, $default = null)
+    {
+        $data = $this->cache->load();
+
+        if (!is_array($data)) {
+            return $default;
+        }
+
+        // ignore data if internal cache expiration time is not set
+        if (!array_key_exists('__cache_expiration_time', $data)) {
+            return $default;
+        }
+
+        // ignore data if internal cache expiration time is expired
+        if ($data['__cache_expiration_time'] < time()) {
+            return $default;
+        }
+
+        // remove internal cache expiration time
+        unset($data['__cache_expiration_time']);
+
+        return $data;
+    }
+
+    /**
+     * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::set()
+     * <code>
+     * public function set(string $key, mixed $value, null|int|\DateInterval $ttl = null): bool;
+     * </code>
+     *
+     * @param string   $key   The key of the item to store.
+     * @param array    $value The value of the item to store, must be serializable.
+     * @param null|int $ttl   Optional. The TTL value of this item. If no value is sent and
+     *                                      the driver supports TTL then the library may set a default value
+     *                                      for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function set_data(string $key, array $value, ?int $ttl = null): bool
+    {
+        if ($ttl === null) {
+            $ttl = 3600;
+        }
+
+        // place internal cache expiration time
+        $value['__cache_expiration_time'] = time() + $ttl;
+
+        return $this->cache->save($value);
+    }
+
+    /**
+     * Delete an item from the cache by its unique key.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::delete()
+     * <code>
+     * public function delete(string $key): bool;
+     * </code>
+     *
+     * @param string $key The unique cache key of the item to delete.
+     *
+     * @return bool True if the item was successfully removed. False if there was an error.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function delete_data(string $key): bool
+    {
+        return $this->cache->unlink();
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/src/Cache/BaseDataCache.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePiesrcCacheCallableNameFilterphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/src/Cache/CallableNameFilter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Cache/CallableNameFilter.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Cache/CallableNameFilter.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,89 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2022 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+/**
+ * Creating a cache filename with callables
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+final class CallableNameFilter implements NameFilter
+{
+    /**
+     * @var callable
+     */
+    private $callable;
+
+    public function __construct(callable $callable)
+    {
+        $this->callable = $callable;
+    }
+
+    /**
+     * Method to create cache filename with.
+     *
+     * The returning name MUST follow the rules for keys in PSR-16.
+     *
+     * @link https://www.php-fig.org/psr/psr-16/
+     *
+     * The returning name MUST be a string of at least one character
+     * that uniquely identifies a cached item, MUST only contain the
+     * characters A-Z, a-z, 0-9, _, and . in any order in UTF-8 encoding
+     * and MUST not longer then 64 characters. The following characters
+     * are reserved for future extensions and MUST NOT be used: {}()/\@:
+     *
+     * A provided implementing library MAY support additional characters
+     * and encodings or longer lengths, but MUST support at least that
+     * minimum.
+     *
+     * @param string $name The name for the cache will be most likly an url with query string
+     *
+     * @return string the new cache name
+     */
+    public function filter(string $name): string
+    {
+        return call_user_func($this->callable, $name);
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/src/Cache/CallableNameFilter.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePiesrcCacheDBphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Cache/DB.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Cache/DB.php      2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Cache/DB.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,96 +42,80 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Cache;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Base class for database-based caches
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Caching
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated since SimplePie 1.8.0, use implementation of "Psr\SimpleCache\CacheInterface" instead
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-abstract class SimplePie_Cache_DB implements SimplePie_Cache_Base
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+abstract class DB implements Base
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Helper for database conversion
-        *
-        * Converts a given {@see SimplePie} object into data to be stored
-        *
-        * @param SimplePie $data
-        * @return array First item is the serialized data for storage, second item is the unique ID for this item
-        */
-       protected static function prepare_simplepie_object_for_cache($data)
-       {
-               $items = $data->get_items();
-               $items_by_id = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Helper for database conversion
+     *
+     * Converts a given {@see SimplePie} object into data to be stored
+     *
+     * @param \SimplePie\SimplePie $data
+     * @return array First item is the serialized data for storage, second item is the unique ID for this item
+     */
+    protected static function prepare_simplepie_object_for_cache($data)
+    {
+        $items = $data->get_items();
+        $items_by_id = [];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if (!empty($items))
-               {
-                       foreach ($items as $item)
-                       {
-                               $items_by_id[$item->get_id()] = $item;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if (!empty($items)) {
+            foreach ($items as $item) {
+                $items_by_id[$item->get_id()] = $item;
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if (count($items_by_id) !== count($items))
-                       {
-                               $items_by_id = array();
-                               foreach ($items as $item)
-                               {
-                                       $items_by_id[$item->get_id(true)] = $item;
-                               }
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            if (count($items_by_id) !== count($items)) {
+                $items_by_id = [];
+                foreach ($items as $item) {
+                    $items_by_id[$item->get_id(true)] = $item;
+                }
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
-                       {
-                               $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
-                       }
-                       elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
-                       {
-                               $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
-                       }
-                       elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
-                       {
-                               $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
-                       }
-                       elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
-                       {
-                               $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
-                       }
-                       else
-                       {
-                               $channel = null;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            if (isset($data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0])) {
+                $channel = &$data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0];
+            } elseif (isset($data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0])) {
+                $channel = &$data->data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0];
+            } elseif (isset($data->data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0])) {
+                $channel = &$data->data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0];
+            } elseif (isset($data->data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0]['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['channel'][0])) {
+                $channel = &$data->data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0]['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['channel'][0];
+            } else {
+                $channel = null;
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ($channel !== null)
-                       {
-                               if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']))
-                               {
-                                       unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']);
-                               }
-                               if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']))
-                               {
-                                       unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']);
-                               }
-                               if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']))
-                               {
-                                       unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']);
-                               }
-                               if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']))
-                               {
-                                       unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']);
-                               }
-                               if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']))
-                               {
-                                       unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']);
-                               }
-                       }
-                       if (isset($data->data['items']))
-                       {
-                               unset($data->data['items']);
-                       }
-                       if (isset($data->data['ordered_items']))
-                       {
-                               unset($data->data['ordered_items']);
-                       }
-               }
-               return array(serialize($data->data), $items_by_id);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            if ($channel !== null) {
+                if (isset($channel['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['entry'])) {
+                    unset($channel['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['entry']);
+                }
+                if (isset($channel['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['entry'])) {
+                    unset($channel['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['entry']);
+                }
+                if (isset($channel['child'][\SimplePie\SimplePie::NAMESPACE_RSS_10]['item'])) {
+                    unset($channel['child'][\SimplePie\SimplePie::NAMESPACE_RSS_10]['item']);
+                }
+                if (isset($channel['child'][\SimplePie\SimplePie::NAMESPACE_RSS_090]['item'])) {
+                    unset($channel['child'][\SimplePie\SimplePie::NAMESPACE_RSS_090]['item']);
+                }
+                if (isset($channel['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['item'])) {
+                    unset($channel['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['item']);
+                }
+            }
+            if (isset($data->data['items'])) {
+                unset($data->data['items']);
+            }
+            if (isset($data->data['ordered_items'])) {
+                unset($data->data['ordered_items']);
+            }
+        }
+        return [serialize($data->data), $items_by_id];
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\Cache\DB', 'SimplePie_Cache_DB');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCacheDataCachephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/src/Cache/DataCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Cache/DataCache.php                           (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Cache/DataCache.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,119 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2022 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+use InvalidArgumentException;
+
+/**
+ * Subset of PSR-16 Cache client for caching data arrays
+ *
+ * Only get(), set() and delete() methods are used,
+ * but not has(), getMultiple(), setMultiple() or deleteMultiple().
+ *
+ * The methods names must be different, but should be compatible to the
+ * methods of \Psr\SimpleCache\CacheInterface.
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ * @internal
+ */
+interface DataCache
+{
+    /**
+     * Fetches a value from the cache.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::get()
+     * <code>
+     * public function get(string $key, mixed $default = null): mixed;
+     * </code>
+     *
+     * @param string   $key     The unique key of this item in the cache.
+     * @param mixed    $default Default value to return if the key does not exist.
+     *
+     * @return array|mixed The value of the item from the cache, or $default in case of cache miss.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function get_data(string $key, $default = null);
+
+    /**
+     * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::set()
+     * <code>
+     * public function set(string $key, mixed $value, null|int|\DateInterval $ttl = null): bool;
+     * </code>
+     *
+     * @param string   $key   The key of the item to store.
+     * @param array    $value The value of the item to store, must be serializable.
+     * @param null|int $ttl   Optional. The TTL value of this item. If no value is sent and
+     *                                      the driver supports TTL then the library may set a default value
+     *                                      for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function set_data(string $key, array $value, ?int $ttl = null): bool;
+
+    /**
+     * Delete an item from the cache by its unique key.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::delete()
+     * <code>
+     * public function delete(string $key): bool;
+     * </code>
+     *
+     * @param string $key The unique cache key of the item to delete.
+     *
+     * @return bool True if the item was successfully removed. False if there was an error.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function delete_data(string $key): bool;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/src/Cache/DataCache.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePiesrcCacheFilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Cache/File.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Cache/File.php    2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Cache/File.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,124 +42,125 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Cache;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Caches data to the filesystem
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Caching
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated since SimplePie 1.8.0, use implementation of "Psr\SimpleCache\CacheInterface" instead
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_Cache_File implements SimplePie_Cache_Base
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class File implements Base
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Location string
-        *
-        * @see SimplePie::$cache_location
-        * @var string
-        */
-       protected $location;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Location string
+     *
+     * @see SimplePie::$cache_location
+     * @var string
+     */
+    protected $location;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Filename
-        *
-        * @var string
-        */
-       protected $filename;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Filename
+     *
+     * @var string
+     */
+    protected $filename;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * File extension
-        *
-        * @var string
-        */
-       protected $extension;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * File extension
+     *
+     * @var string
+     */
+    protected $extension;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * File path
-        *
-        * @var string
-        */
-       protected $name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * File path
+     *
+     * @var string
+     */
+    protected $name;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create a new cache object
-        *
-        * @param string $location Location string (from SimplePie::$cache_location)
-        * @param string $name Unique ID for the cache
-        * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
-        */
-       public function __construct($location, $name, $type)
-       {
-               $this->location = $location;
-               $this->filename = $name;
-               $this->extension = $type;
-               $this->name = "$this->location/$this->filename.$this->extension";
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Create a new cache object
+     *
+     * @param string $location Location string (from SimplePie::$cache_location)
+     * @param string $name Unique ID for the cache
+     * @param Base::TYPE_FEED|Base::TYPE_IMAGE $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+     */
+    public function __construct($location, $name, $type)
+    {
+        $this->location = $location;
+        $this->filename = $name;
+        $this->extension = $type;
+        $this->name = "$this->location/$this->filename.$this->extension";
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Save data to the cache
-        *
-        * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
-        * @return bool Successfulness
-        */
-       public function save($data)
-       {
-               if (file_exists($this->name) && is_writable($this->name) || file_exists($this->location) && is_writable($this->location))
-               {
-                       if ($data instanceof SimplePie)
-                       {
-                               $data = $data->data;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Save data to the cache
+     *
+     * @param array|\SimplePie\SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+     * @return bool Successfulness
+     */
+    public function save($data)
+    {
+        if (file_exists($this->name) && is_writable($this->name) || file_exists($this->location) && is_writable($this->location)) {
+            if ($data instanceof \SimplePie\SimplePie) {
+                $data = $data->data;
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $data = serialize($data);
-                       return (bool) file_put_contents($this->name, $data);
-               }
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            $data = serialize($data);
+            return (bool) file_put_contents($this->name, $data);
+        }
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Retrieve the data saved to the cache
-        *
-        * @return array Data for SimplePie::$data
-        */
-       public function load()
-       {
-               if (file_exists($this->name) && is_readable($this->name))
-               {
-                       return unserialize(file_get_contents($this->name));
-               }
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Retrieve the data saved to the cache
+     *
+     * @return array Data for SimplePie::$data
+     */
+    public function load()
+    {
+        if (file_exists($this->name) && is_readable($this->name)) {
+            return unserialize(file_get_contents($this->name));
+        }
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Retrieve the last modified time for the cache
-        *
-        * @return int Timestamp
-        */
-       public function mtime()
-       {
-               return @filemtime($this->name);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Retrieve the last modified time for the cache
+     *
+     * @return int Timestamp
+     */
+    public function mtime()
+    {
+        return @filemtime($this->name);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Set the last modified time to the current time
-        *
-        * @return bool Success status
-        */
-       public function touch()
-       {
-               return @touch($this->name);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Set the last modified time to the current time
+     *
+     * @return bool Success status
+     */
+    public function touch()
+    {
+        return @touch($this->name);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Remove the cache
-        *
-        * @return bool Success status
-        */
-       public function unlink()
-       {
-               if (file_exists($this->name))
-               {
-                       return unlink($this->name);
-               }
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Remove the cache
+     *
+     * @return bool Success status
+     */
+    public function unlink()
+    {
+        if (file_exists($this->name)) {
+            return unlink($this->name);
+        }
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\Cache\File', 'SimplePie_Cache_File');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCacheMemcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Cache/Memcache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Cache/Memcache.php        2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Cache/Memcache.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +42,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Cache;
+
+use Memcache as NativeMemcache;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Caches data to memcache
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,128 +58,127 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Caching
</span><span class="cx" style="display: block; padding: 0 10px">  * @uses Memcache
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated since SimplePie 1.8.0, use implementation of "Psr\SimpleCache\CacheInterface" instead
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_Cache_Memcache implements SimplePie_Cache_Base
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Memcache implements Base
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Memcache instance
-        *
-        * @var Memcache
-        */
-       protected $cache;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Memcache instance
+     *
+     * @var Memcache
+     */
+    protected $cache;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Options
-        *
-        * @var array
-        */
-       protected $options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Options
+     *
+     * @var array
+     */
+    protected $options;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Cache name
-        *
-        * @var string
-        */
-       protected $name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Cache name
+     *
+     * @var string
+     */
+    protected $name;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create a new cache object
-        *
-        * @param string $location Location string (from SimplePie::$cache_location)
-        * @param string $name Unique ID for the cache
-        * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
-        */
-       public function __construct($location, $name, $type)
-       {
-               $this->options = array(
-                       'host' => '127.0.0.1',
-                       'port' => 11211,
-                       'extras' => array(
-                               'timeout' => 3600, // one hour
-                               'prefix' => 'simplepie_',
-                       ),
-               );
-               $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Create a new cache object
+     *
+     * @param string $location Location string (from SimplePie::$cache_location)
+     * @param string $name Unique ID for the cache
+     * @param Base::TYPE_FEED|Base::TYPE_IMAGE $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+     */
+    public function __construct($location, $name, $type)
+    {
+        $this->options = [
+            'host' => '127.0.0.1',
+            'port' => 11211,
+            'extras' => [
+                'timeout' => 3600, // one hour
+                'prefix' => 'simplepie_',
+            ],
+        ];
+        $this->options = array_replace_recursive($this->options, \SimplePie\Cache::parse_URL($location));
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->cache = new Memcache();
-               $this->cache->addServer($this->options['host'], (int) $this->options['port']);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $this->cache = new NativeMemcache();
+        $this->cache->addServer($this->options['host'], (int) $this->options['port']);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Save data to the cache
-        *
-        * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
-        * @return bool Successfulness
-        */
-       public function save($data)
-       {
-               if ($data instanceof SimplePie)
-               {
-                       $data = $data->data;
-               }
-               return $this->cache->set($this->name, serialize($data), MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Save data to the cache
+     *
+     * @param array|\SimplePie\SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+     * @return bool Successfulness
+     */
+    public function save($data)
+    {
+        if ($data instanceof \SimplePie\SimplePie) {
+            $data = $data->data;
+        }
+        return $this->cache->set($this->name, serialize($data), MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Retrieve the data saved to the cache
-        *
-        * @return array Data for SimplePie::$data
-        */
-       public function load()
-       {
-               $data = $this->cache->get($this->name);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Retrieve the data saved to the cache
+     *
+     * @return array Data for SimplePie::$data
+     */
+    public function load()
+    {
+        $data = $this->cache->get($this->name);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ($data !== false)
-               {
-                       return unserialize($data);
-               }
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if ($data !== false) {
+            return unserialize($data);
+        }
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Retrieve the last modified time for the cache
-        *
-        * @return int Timestamp
-        */
-       public function mtime()
-       {
-               $data = $this->cache->get($this->name);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Retrieve the last modified time for the cache
+     *
+     * @return int Timestamp
+     */
+    public function mtime()
+    {
+        $data = $this->cache->get($this->name);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ($data !== false)
-               {
-                       // essentially ignore the mtime because Memcache expires on its own
-                       return time();
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if ($data !== false) {
+            // essentially ignore the mtime because Memcache expires on its own
+            return time();
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Set the last modified time to the current time
-        *
-        * @return bool Success status
-        */
-       public function touch()
-       {
-               $data = $this->cache->get($this->name);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Set the last modified time to the current time
+     *
+     * @return bool Success status
+     */
+    public function touch()
+    {
+        $data = $this->cache->get($this->name);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ($data !== false)
-               {
-                       return $this->cache->set($this->name, $data, MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']);
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if ($data !== false) {
+            return $this->cache->set($this->name, $data, MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']);
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Remove the cache
-        *
-        * @return bool Success status
-        */
-       public function unlink()
-       {
-               return $this->cache->delete($this->name, 0);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Remove the cache
+     *
+     * @return bool Success status
+     */
+    public function unlink()
+    {
+        return $this->cache->delete($this->name, 0);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\Cache\Memcache', 'SimplePie_Cache_Memcache');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCacheMemcachedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Cache/Memcached.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Cache/Memcached.php       2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Cache/Memcached.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +42,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Cache;
+
+use Memcached as NativeMemcached;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Caches data to memcached
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,12 +59,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Caching
</span><span class="cx" style="display: block; padding: 0 10px">  * @author     Paul L. McNeely
</span><span class="cx" style="display: block; padding: 0 10px">  * @uses       Memcached
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated since SimplePie 1.8.0, use implementation of "Psr\SimpleCache\CacheInterface" instead
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_Cache_Memcached implements SimplePie_Cache_Base
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Memcached implements Base
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px">     /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * Memcached instance
-     * @var Memcached
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+     * NativeMemcached instance
+     * @var NativeMemcached
</ins><span class="cx" style="display: block; padding: 0 10px">      */
</span><span class="cx" style="display: block; padding: 0 10px">     protected $cache;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,33 +84,35 @@
</span><span class="cx" style="display: block; padding: 0 10px">     /**
</span><span class="cx" style="display: block; padding: 0 10px">      * Create a new cache object
</span><span class="cx" style="display: block; padding: 0 10px">      * @param string $location Location string (from SimplePie::$cache_location)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * @param string $name     Unique ID for the cache
-     * @param string $type     Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+     * @param string $name Unique ID for the cache
+     * @param Base::TYPE_FEED|Base::TYPE_IMAGE $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
</ins><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function __construct($location, $name, $type) {
-        $this->options = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function __construct($location, $name, $type)
+    {
+        $this->options = [
</ins><span class="cx" style="display: block; padding: 0 10px">             'host'   => '127.0.0.1',
</span><span class="cx" style="display: block; padding: 0 10px">             'port'   => 11211,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-            'extras' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            'extras' => [
</ins><span class="cx" style="display: block; padding: 0 10px">                 'timeout' => 3600, // one hour
</span><span class="cx" style="display: block; padding: 0 10px">                 'prefix'  => 'simplepie_',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-            ),
-        );
-        $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            ],
+        ];
+        $this->options = array_replace_recursive($this->options, \SimplePie\Cache::parse_URL($location));
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">         $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $this->cache = new Memcached();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $this->cache = new NativeMemcached();
</ins><span class="cx" style="display: block; padding: 0 10px">         $this->cache->addServer($this->options['host'], (int)$this->options['port']);
</span><span class="cx" style="display: block; padding: 0 10px">     }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     /**
</span><span class="cx" style="display: block; padding: 0 10px">      * Save data to the cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+     * @param array|\SimplePie\SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
</ins><span class="cx" style="display: block; padding: 0 10px">      * @return bool Successfulness
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function save($data) {
-        if ($data instanceof SimplePie) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function save($data)
+    {
+        if ($data instanceof \SimplePie\SimplePie) {
</ins><span class="cx" style="display: block; padding: 0 10px">             $data = $data->data;
</span><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +123,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">      * Retrieve the data saved to the cache
</span><span class="cx" style="display: block; padding: 0 10px">      * @return array Data for SimplePie::$data
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function load() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function load()
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         $data = $this->cache->get($this->name);
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">         if ($data !== false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">      * Retrieve the last modified time for the cache
</span><span class="cx" style="display: block; padding: 0 10px">      * @return int Timestamp
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function mtime() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function mtime()
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         $data = $this->cache->get($this->name . '_mtime');
</span><span class="cx" style="display: block; padding: 0 10px">         return (int) $data;
</span><span class="cx" style="display: block; padding: 0 10px">     }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +147,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">      * Set the last modified time to the current time
</span><span class="cx" style="display: block; padding: 0 10px">      * @return bool Success status
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function touch() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function touch()
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         $data = $this->cache->get($this->name);
</span><span class="cx" style="display: block; padding: 0 10px">         return $this->setData($data);
</span><span class="cx" style="display: block; padding: 0 10px">     }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,16 +157,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">      * Remove the cache
</span><span class="cx" style="display: block; padding: 0 10px">      * @return bool Success status
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function unlink() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function unlink()
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         return $this->cache->delete($this->name, 0);
</span><span class="cx" style="display: block; padding: 0 10px">     }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * Set the last modified time and data to Memcached
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+     * Set the last modified time and data to NativeMemcached
</ins><span class="cx" style="display: block; padding: 0 10px">      * @return bool Success status
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    private function setData($data) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private function setData($data)
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         if ($data !== false) {
</span><span class="cx" style="display: block; padding: 0 10px">             $this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']);
</span><span class="cx" style="display: block; padding: 0 10px">             return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,3 +176,5 @@
</span><span class="cx" style="display: block; padding: 0 10px">         return false;
</span><span class="cx" style="display: block; padding: 0 10px">     }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\Cache\Memcached', 'SimplePie_Cache_Memcached');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCacheMySQLphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Cache/MySQL.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Cache/MySQL.php   2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Cache/MySQL.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +42,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Cache;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Caches data to a MySQL database
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,389 +55,329 @@
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Caching
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated since SimplePie 1.8.0, use implementation of "Psr\SimpleCache\CacheInterface" instead
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_Cache_MySQL extends SimplePie_Cache_DB
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class MySQL extends DB
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * PDO instance
-        *
-        * @var PDO
-        */
-       protected $mysql;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * PDO instance
+     *
+     * @var \PDO
+     */
+    protected $mysql;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Options
-        *
-        * @var array
-        */
-       protected $options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Options
+     *
+     * @var array
+     */
+    protected $options;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Cache ID
-        *
-        * @var string
-        */
-       protected $id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Cache ID
+     *
+     * @var string
+     */
+    protected $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create a new cache object
-        *
-        * @param string $location Location string (from SimplePie::$cache_location)
-        * @param string $name Unique ID for the cache
-        * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
-        */
-       public function __construct($location, $name, $type)
-       {
-               $this->options = array(
-                       'user' => null,
-                       'pass' => null,
-                       'host' => '127.0.0.1',
-                       'port' => '3306',
-                       'path' => '',
-                       'extras' => array(
-                               'prefix' => '',
-                               'cache_purge_time' => 2592000
-                       ),
-               );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Create a new cache object
+     *
+     * @param string $location Location string (from SimplePie::$cache_location)
+     * @param string $name Unique ID for the cache
+     * @param Base::TYPE_FEED|Base::TYPE_IMAGE $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+     */
+    public function __construct($location, $name, $type)
+    {
+        $this->options = [
+            'user' => null,
+            'pass' => null,
+            'host' => '127.0.0.1',
+            'port' => '3306',
+            'path' => '',
+            'extras' => [
+                'prefix' => '',
+                'cache_purge_time' => 2592000
+            ],
+        ];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $this->options = array_replace_recursive($this->options, \SimplePie\Cache::parse_URL($location));
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Path is prefixed with a "/"
-               $this->options['dbname'] = substr($this->options['path'], 1);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        // Path is prefixed with a "/"
+        $this->options['dbname'] = substr($this->options['path'], 1);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                try
-               {
-                       $this->mysql = new PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-               }
-               catch (PDOException $e)
-               {
-                       $this->mysql = null;
-                       return;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        try {
+            $this->mysql = new \PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], [\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8']);
+        } catch (\PDOException $e) {
+            $this->mysql = null;
+            return;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->id = $name . $type;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $this->id = $name . $type;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if (!$query = $this->mysql->query('SHOW TABLES'))
-               {
-                       $this->mysql = null;
-                       return;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if (!$query = $this->mysql->query('SHOW TABLES')) {
+            $this->mysql = null;
+            return;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $db = array();
-               while ($row = $query->fetchColumn())
-               {
-                       $db[] = $row;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $db = [];
+        while ($row = $query->fetchColumn()) {
+            $db[] = $row;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
-               {
-                       $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
-                       if ($query === false)
-                       {
-                               trigger_error("Can't create " . $this->options['extras']['prefix'] . "cache_data table, check permissions", E_USER_WARNING);
-                               $this->mysql = null;
-                               return;
-                       }
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db)) {
+            $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
+            if ($query === false) {
+                trigger_error("Can't create " . $this->options['extras']['prefix'] . "cache_data table, check permissions", \E_USER_WARNING);
+                $this->mysql = null;
+                return;
+            }
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if (!in_array($this->options['extras']['prefix'] . 'items', $db))
-               {
-                       $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
-                       if ($query === false)
-                       {
-                               trigger_error("Can't create " . $this->options['extras']['prefix'] . "items table, check permissions", E_USER_WARNING);
-                               $this->mysql = null;
-                               return;
-                       }
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if (!in_array($this->options['extras']['prefix'] . 'items', $db)) {
+            $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
+            if ($query === false) {
+                trigger_error("Can't create " . $this->options['extras']['prefix'] . "items table, check permissions", \E_USER_WARNING);
+                $this->mysql = null;
+                return;
+            }
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Save data to the cache
-        *
-        * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
-        * @return bool Successfulness
-        */
-       public function save($data)
-       {
-               if ($this->mysql === null)
-               {
-                       return false;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Save data to the cache
+     *
+     * @param array|\SimplePie\SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+     * @return bool Successfulness
+     */
+    public function save($data)
+    {
+        if ($this->mysql === null) {
+            return false;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $query = $this->mysql->prepare('DELETE i, cd FROM `' . $this->options['extras']['prefix'] . 'cache_data` cd, ' .
-                       '`' . $this->options['extras']['prefix'] . 'items` i ' .
-                       'WHERE cd.id = i.feed_id ' .
-                       'AND cd.mtime < (unix_timestamp() - :purge_time)');
-               $query->bindValue(':purge_time', $this->options['extras']['cache_purge_time']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $query = $this->mysql->prepare('DELETE i, cd FROM `' . $this->options['extras']['prefix'] . 'cache_data` cd, ' .
+            '`' . $this->options['extras']['prefix'] . 'items` i ' .
+            'WHERE cd.id = i.feed_id ' .
+            'AND cd.mtime < (unix_timestamp() - :purge_time)');
+        $query->bindValue(':purge_time', $this->options['extras']['cache_purge_time']);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if (!$query->execute())
-               {
-                       return false;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if (!$query->execute()) {
+            return false;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ($data instanceof SimplePie)
-               {
-                       $data = clone $data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if ($data instanceof \SimplePie\SimplePie) {
+            $data = clone $data;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $prepared = self::prepare_simplepie_object_for_cache($data);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            $prepared = self::prepare_simplepie_object_for_cache($data);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
-                       $query->bindValue(':feed', $this->id);
-                       if ($query->execute())
-                       {
-                               if ($query->fetchColumn() > 0)
-                               {
-                                       $items = count($prepared[1]);
-                                       if ($items)
-                                       {
-                                               $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
-                                               $query = $this->mysql->prepare($sql);
-                                               $query->bindValue(':items', $items);
-                                       }
-                                       else
-                                       {
-                                               $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
-                                               $query = $this->mysql->prepare($sql);
-                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            $query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+            $query->bindValue(':feed', $this->id);
+            if ($query->execute()) {
+                if ($query->fetchColumn() > 0) {
+                    $items = count($prepared[1]);
+                    if ($items) {
+                        $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
+                        $query = $this->mysql->prepare($sql);
+                        $query->bindValue(':items', $items);
+                    } else {
+                        $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
+                        $query = $this->mysql->prepare($sql);
+                    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $query->bindValue(':data', $prepared[0]);
-                                       $query->bindValue(':time', time());
-                                       $query->bindValue(':feed', $this->id);
-                                       if (!$query->execute())
-                                       {
-                                               return false;
-                                       }
-                               }
-                               else
-                               {
-                                       $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
-                                       $query->bindValue(':feed', $this->id);
-                                       $query->bindValue(':count', count($prepared[1]));
-                                       $query->bindValue(':data', $prepared[0]);
-                                       $query->bindValue(':time', time());
-                                       if (!$query->execute())
-                                       {
-                                               return false;
-                                       }
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                    $query->bindValue(':data', $prepared[0]);
+                    $query->bindValue(':time', time());
+                    $query->bindValue(':feed', $this->id);
+                    if (!$query->execute()) {
+                        return false;
+                    }
+                } else {
+                    $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
+                    $query->bindValue(':feed', $this->id);
+                    $query->bindValue(':count', count($prepared[1]));
+                    $query->bindValue(':data', $prepared[0]);
+                    $query->bindValue(':time', time());
+                    if (!$query->execute()) {
+                        return false;
+                    }
+                }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $ids = array_keys($prepared[1]);
-                               if (!empty($ids))
-                               {
-                                       foreach ($ids as $id)
-                                       {
-                                               $database_ids[] = $this->mysql->quote($id);
-                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $ids = array_keys($prepared[1]);
+                if (!empty($ids)) {
+                    foreach ($ids as $id) {
+                        $database_ids[] = $this->mysql->quote($id);
+                    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
-                                       $query->bindValue(':feed', $this->id);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                    $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
+                    $query->bindValue(':feed', $this->id);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ($query->execute())
-                                       {
-                                               $existing_ids = array();
-                                               while ($row = $query->fetchColumn())
-                                               {
-                                                       $existing_ids[] = $row;
-                                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                    if ($query->execute()) {
+                        $existing_ids = [];
+                        while ($row = $query->fetchColumn()) {
+                            $existing_ids[] = $row;
+                        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $new_ids = array_diff($ids, $existing_ids);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        $new_ids = array_diff($ids, $existing_ids);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                foreach ($new_ids as $new_id)
-                                               {
-                                                       if (!($date = $prepared[1][$new_id]->get_date('U')))
-                                                       {
-                                                               $date = time();
-                                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        foreach ($new_ids as $new_id) {
+                            if (!($date = $prepared[1][$new_id]->get_date('U'))) {
+                                $date = time();
+                            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
-                                                       $query->bindValue(':feed', $this->id);
-                                                       $query->bindValue(':id', $new_id);
-                                                       $query->bindValue(':data', serialize($prepared[1][$new_id]->data));
-                                                       $query->bindValue(':date', $date);
-                                                       if (!$query->execute())
-                                                       {
-                                                               return false;
-                                                       }
-                                               }
-                                               return true;
-                                       }
-                               }
-                               else
-                               {
-                                       return true;
-                               }
-                       }
-               }
-               else
-               {
-                       $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
-                       $query->bindValue(':feed', $this->id);
-                       if ($query->execute())
-                       {
-                               if ($query->rowCount() > 0)
-                               {
-                                       $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
-                                       $query->bindValue(':data', serialize($data));
-                                       $query->bindValue(':time', time());
-                                       $query->bindValue(':feed', $this->id);
-                                       if ($this->execute())
-                                       {
-                                               return true;
-                                       }
-                               }
-                               else
-                               {
-                                       $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
-                                       $query->bindValue(':id', $this->id);
-                                       $query->bindValue(':data', serialize($data));
-                                       $query->bindValue(':time', time());
-                                       if ($query->execute())
-                                       {
-                                               return true;
-                                       }
-                               }
-                       }
-               }
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                            $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
+                            $query->bindValue(':feed', $this->id);
+                            $query->bindValue(':id', $new_id);
+                            $query->bindValue(':data', serialize($prepared[1][$new_id]->data));
+                            $query->bindValue(':date', $date);
+                            if (!$query->execute()) {
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                } else {
+                    return true;
+                }
+            }
+        } else {
+            $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+            $query->bindValue(':feed', $this->id);
+            if ($query->execute()) {
+                if ($query->rowCount() > 0) {
+                    $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
+                    $query->bindValue(':data', serialize($data));
+                    $query->bindValue(':time', time());
+                    $query->bindValue(':feed', $this->id);
+                    if ($query->execute()) {
+                        return true;
+                    }
+                } else {
+                    $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
+                    $query->bindValue(':id', $this->id);
+                    $query->bindValue(':data', serialize($data));
+                    $query->bindValue(':time', time());
+                    if ($query->execute()) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Retrieve the data saved to the cache
-        *
-        * @return array Data for SimplePie::$data
-        */
-       public function load()
-       {
-               if ($this->mysql === null)
-               {
-                       return false;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Retrieve the data saved to the cache
+     *
+     * @return array Data for SimplePie::$data
+     */
+    public function load()
+    {
+        if ($this->mysql === null) {
+            return false;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
-               $query->bindValue(':id', $this->id);
-               if ($query->execute() && ($row = $query->fetch()))
-               {
-                       $data = unserialize($row[1]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query->bindValue(':id', $this->id);
+        if ($query->execute() && ($row = $query->fetch())) {
+            $data = unserialize($row[1]);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if (isset($this->options['items'][0]))
-                       {
-                               $items = (int) $this->options['items'][0];
-                       }
-                       else
-                       {
-                               $items = (int) $row[0];
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            if (isset($this->options['items'][0])) {
+                $items = (int) $this->options['items'][0];
+            } else {
+                $items = (int) $row[0];
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ($items !== 0)
-                       {
-                               if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
-                               {
-                                       $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
-                               }
-                               elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
-                               {
-                                       $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
-                               }
-                               elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
-                               {
-                                       $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
-                               }
-                               elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
-                               {
-                                       $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
-                               }
-                               else
-                               {
-                                       $feed = null;
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            if ($items !== 0) {
+                if (isset($data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0])) {
+                    $feed = &$data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['feed'][0];
+                } elseif (isset($data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0])) {
+                    $feed = &$data['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['feed'][0];
+                } elseif (isset($data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0])) {
+                    $feed = &$data['child'][\SimplePie\SimplePie::NAMESPACE_RDF]['RDF'][0];
+                } elseif (isset($data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0])) {
+                    $feed = &$data['child'][\SimplePie\SimplePie::NAMESPACE_RSS_20]['rss'][0];
+                } else {
+                    $feed = null;
+                }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ($feed !== null)
-                               {
-                                       $sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
-                                       if ($items > 0)
-                                       {
-                                               $sql .= ' LIMIT ' . $items;
-                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ($feed !== null) {
+                    $sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
+                    if ($items > 0) {
+                        $sql .= ' LIMIT ' . $items;
+                    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $query = $this->mysql->prepare($sql);
-                                       $query->bindValue(':feed', $this->id);
-                                       if ($query->execute())
-                                       {
-                                               while ($row = $query->fetchColumn())
-                                               {
-                                                       $feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
-                                               }
-                                       }
-                                       else
-                                       {
-                                               return false;
-                                       }
-                               }
-                       }
-                       return $data;
-               }
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                    $query = $this->mysql->prepare($sql);
+                    $query->bindValue(':feed', $this->id);
+                    if ($query->execute()) {
+                        while ($row = $query->fetchColumn()) {
+                            $feed['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
+                        }
+                    } else {
+                        return false;
+                    }
+                }
+            }
+            return $data;
+        }
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Retrieve the last modified time for the cache
-        *
-        * @return int Timestamp
-        */
-       public function mtime()
-       {
-               if ($this->mysql === null)
-               {
-                       return false;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Retrieve the last modified time for the cache
+     *
+     * @return int Timestamp
+     */
+    public function mtime()
+    {
+        if ($this->mysql === null) {
+            return false;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
-               $query->bindValue(':id', $this->id);
-               if ($query->execute() && ($time = $query->fetchColumn()))
-               {
-                       return $time;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query->bindValue(':id', $this->id);
+        if ($query->execute() && ($time = $query->fetchColumn())) {
+            return $time;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Set the last modified time to the current time
-        *
-        * @return bool Success status
-        */
-       public function touch()
-       {
-               if ($this->mysql === null)
-               {
-                       return false;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Set the last modified time to the current time
+     *
+     * @return bool Success status
+     */
+    public function touch()
+    {
+        if ($this->mysql === null) {
+            return false;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
-               $query->bindValue(':time', time());
-               $query->bindValue(':id', $this->id);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
+        $query->bindValue(':time', time());
+        $query->bindValue(':id', $this->id);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $query->execute() && $query->rowCount() > 0;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return $query->execute() && $query->rowCount() > 0;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Remove the cache
-        *
-        * @return bool Success status
-        */
-       public function unlink()
-       {
-               if ($this->mysql === null)
-               {
-                       return false;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Remove the cache
+     *
+     * @return bool Success status
+     */
+    public function unlink()
+    {
+        if ($this->mysql === null) {
+            return false;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
-               $query->bindValue(':id', $this->id);
-               $query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
-               $query2->bindValue(':id', $this->id);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query->bindValue(':id', $this->id);
+        $query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
+        $query2->bindValue(':id', $this->id);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $query->execute() && $query2->execute();
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return $query->execute() && $query2->execute();
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\Cache\MySQL', 'SimplePie_Cache_MySQL');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCacheNameFilterphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/src/Cache/NameFilter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Cache/NameFilter.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Cache/NameFilter.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,76 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2022 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+/**
+ * Interface for creating a cache filename
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+interface NameFilter
+{
+    /**
+     * Method to create cache filename with.
+     *
+     * The returning name MUST follow the rules for keys in PSR-16.
+     *
+     * @link https://www.php-fig.org/psr/psr-16/
+     *
+     * The returning name MUST be a string of at least one character
+     * that uniquely identifies a cached item, MUST only contain the
+     * characters A-Z, a-z, 0-9, _, and . in any order in UTF-8 encoding
+     * and MUST not longer then 64 characters. The following characters
+     * are reserved for future extensions and MUST NOT be used: {}()/\@:
+     *
+     * A provided implementing library MAY support additional characters
+     * and encodings or longer lengths, but MUST support at least that
+     * minimum.
+     *
+     * @param string $name The name for the cache will be most likly an url with query string
+     *
+     * @return string the new cache name
+     */
+    public function filter(string $name): string;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/src/Cache/NameFilter.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePiesrcCachePsr16php"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/src/Cache/Psr16.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Cache/Psr16.php                               (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Cache/Psr16.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,146 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2022 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\InvalidArgumentException;
+
+/**
+ * Caches data into a PSR-16 cache implementation
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ * @internal
+ */
+final class Psr16 implements DataCache
+{
+    /**
+     * PSR-16 cache implementation
+     *
+     * @var CacheInterface
+     */
+    private $cache;
+
+    /**
+     * PSR-16 cache implementation
+     *
+     * @param CacheInterface $cache
+     */
+    public function __construct(CacheInterface $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Fetches a value from the cache.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::get()
+     * <code>
+     * public function get(string $key, mixed $default = null): mixed;
+     * </code>
+     *
+     * @param string $key     The unique key of this item in the cache.
+     * @param mixed  $default Default value to return if the key does not exist.
+     *
+     * @return array|mixed The value of the item from the cache, or $default in case of cache miss.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function get_data(string $key, $default = null)
+    {
+        $data = $this->cache->get($key, $default);
+
+        if (!is_array($data) || $data === $default) {
+            return $default;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::set()
+     * <code>
+     * public function set(string $key, mixed $value, null|int|\DateInterval $ttl = null): bool;
+     * </code>
+     *
+     * @param string   $key   The key of the item to store.
+     * @param array    $value The value of the item to store, must be serializable.
+     * @param null|int $ttl   Optional. The TTL value of this item. If no value is sent and
+     *                                      the driver supports TTL then the library may set a default value
+     *                                      for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function set_data(string $key, array $value, ?int $ttl = null): bool
+    {
+        return $this->cache->set($key, $value, $ttl);
+    }
+
+    /**
+     * Delete an item from the cache by its unique key.
+     *
+     * Equivalent to \Psr\SimpleCache\CacheInterface::delete()
+     * <code>
+     * public function delete(string $key): bool;
+     * </code>
+     *
+     * @param string $key The unique cache key of the item to delete.
+     *
+     * @return bool True if the item was successfully removed. False if there was an error.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function delete_data(string $key): bool
+    {
+        return $this->cache->delete($key);
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/src/Cache/Psr16.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePiesrcCacheRedisphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Cache/Redis.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Cache/Redis.php   2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Cache/Redis.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,16 +1,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * SimplePie Redis Cache Extension
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * SimplePie
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @author Jan Kozak <galvani78@gmail.com>
- * @link http://galvani.cz/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
</ins><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 0.2.9
</del><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Cache;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use Redis as NativeRedis;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Caches data to redis
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,12 +58,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Caching
</span><span class="cx" style="display: block; padding: 0 10px">  * @uses Redis
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated since SimplePie 1.8.0, use implementation of "Psr\SimpleCache\CacheInterface" instead
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_Cache_Redis implements SimplePie_Cache_Base {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Redis implements Base
+{
</ins><span class="cx" style="display: block; padding: 0 10px">     /**
</span><span class="cx" style="display: block; padding: 0 10px">      * Redis instance
</span><span class="cx" style="display: block; padding: 0 10px">      *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * @var \Redis
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+     * @var NativeRedis
</ins><span class="cx" style="display: block; padding: 0 10px">      */
</span><span class="cx" style="display: block; padding: 0 10px">     protected $cache;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,23 +84,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">     protected $name;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * Cache Data
-     *
-     * @var type
-     */
-    protected $data;
-
-    /**
</del><span class="cx" style="display: block; padding: 0 10px">      * Create a new cache object
</span><span class="cx" style="display: block; padding: 0 10px">      *
</span><span class="cx" style="display: block; padding: 0 10px">      * @param string $location Location string (from SimplePie::$cache_location)
</span><span class="cx" style="display: block; padding: 0 10px">      * @param string $name Unique ID for the cache
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+     * @param Base::TYPE_FEED|Base::TYPE_IMAGE $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
</ins><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function __construct($location, $name, $options = null) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function __construct($location, $name, $options = null)
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         //$this->cache = \flow\simple\cache\Redis::getRedisClientInstance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $parsed = SimplePie_Cache::parse_URL($location);
-        $redis = new Redis();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $parsed = \SimplePie\Cache::parse_URL($location);
+        $redis = new NativeRedis();
</ins><span class="cx" style="display: block; padding: 0 10px">         $redis->connect($parsed['host'], $parsed['port']);
</span><span class="cx" style="display: block; padding: 0 10px">         if (isset($parsed['pass'])) {
</span><span class="cx" style="display: block; padding: 0 10px">             $redis->auth($parsed['pass']);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,10 +107,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">         if (!is_null($options) && is_array($options)) {
</span><span class="cx" style="display: block; padding: 0 10px">             $this->options = $options;
</span><span class="cx" style="display: block; padding: 0 10px">         } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-            $this->options = array (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            $this->options = [
</ins><span class="cx" style="display: block; padding: 0 10px">                 'prefix' => 'rss:simple_primary:',
</span><span class="cx" style="display: block; padding: 0 10px">                 'expire' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-            );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            ];
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">         $this->name = $this->options['prefix'] . $name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,9 +117,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">     }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">     /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * @param \Redis $cache
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+     * @param NativeRedis $cache
</ins><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function setRedisClient(\Redis $cache) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function setRedisClient(NativeRedis $cache)
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         $this->cache = $cache;
</span><span class="cx" style="display: block; padding: 0 10px">     }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,11 +127,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">     /**
</span><span class="cx" style="display: block; padding: 0 10px">      * Save data to the cache
</span><span class="cx" style="display: block; padding: 0 10px">      *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-     * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+     * @param array|\SimplePie\SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
</ins><span class="cx" style="display: block; padding: 0 10px">      * @return bool Successfulness
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function save($data) {
-        if ($data instanceof SimplePie) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function save($data)
+    {
+        if ($data instanceof \SimplePie\SimplePie) {
</ins><span class="cx" style="display: block; padding: 0 10px">             $data = $data->data;
</span><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px">         $response = $this->cache->set($this->name, serialize($data));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +148,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">      *
</span><span class="cx" style="display: block; padding: 0 10px">      * @return array Data for SimplePie::$data
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function load() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function load()
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         $data = $this->cache->get($this->name);
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">         if ($data !== false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,8 +163,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">      *
</span><span class="cx" style="display: block; padding: 0 10px">      * @return int Timestamp
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function mtime() {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function mtime()
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         $data = $this->cache->get($this->name);
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">         if ($data !== false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,8 +179,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">      *
</span><span class="cx" style="display: block; padding: 0 10px">      * @return bool Success status
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function touch() {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function touch()
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         $data = $this->cache->get($this->name);
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">         if ($data !== false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,8 +199,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">      *
</span><span class="cx" style="display: block; padding: 0 10px">      * @return bool Success status
</span><span class="cx" style="display: block; padding: 0 10px">      */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-    public function unlink() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function unlink()
+    {
</ins><span class="cx" style="display: block; padding: 0 10px">         return $this->cache->set($this->name, null);
</span><span class="cx" style="display: block; padding: 0 10px">     }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class_alias('SimplePie\Cache\Redis', 'SimplePie_Cache_Redis');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCachephpfromrev59140trunksrcwpincludesSimplePieCachephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Cache.php (from rev 59140, trunk/src/wp-includes/SimplePie/Cache.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Cache.php                             (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Cache.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,143 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+use SimplePie\Cache\Base;
+
+/**
+ * Used to create cache objects
+ *
+ * This class can be overloaded with {@see SimplePie::set_cache_class()},
+ * although the preferred way is to create your own handler
+ * via {@see register()}
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ * @deprecated since SimplePie 1.8.0, use "SimplePie\SimplePie::set_cache()" instead
+ */
+class Cache
+{
+    /**
+     * Cache handler classes
+     *
+     * These receive 3 parameters to their constructor, as documented in
+     * {@see register()}
+     * @var array
+     */
+    protected static $handlers = [
+        'mysql'     => 'SimplePie\Cache\MySQL',
+        'memcache'  => 'SimplePie\Cache\Memcache',
+        'memcached' => 'SimplePie\Cache\Memcached',
+        'redis'     => 'SimplePie\Cache\Redis'
+    ];
+
+    /**
+     * Don't call the constructor. Please.
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Create a new SimplePie\Cache object
+     *
+     * @param string $location URL location (scheme is used to determine handler)
+     * @param string $filename Unique identifier for cache object
+     * @param Base::TYPE_FEED|Base::TYPE_IMAGE $extension 'spi' or 'spc'
+     * @return Base Type of object depends on scheme of `$location`
+     */
+    public static function get_handler($location, $filename, $extension)
+    {
+        $type = explode(':', $location, 2);
+        $type = $type[0];
+        if (!empty(self::$handlers[$type])) {
+            $class = self::$handlers[$type];
+            return new $class($location, $filename, $extension);
+        }
+
+        return new \SimplePie\Cache\File($location, $filename, $extension);
+    }
+
+    /**
+     * Create a new SimplePie\Cache object
+     *
+     * @deprecated since SimplePie 1.3.1, use {@see get_handler()} instead
+     */
+    public function create($location, $filename, $extension)
+    {
+        trigger_error('Cache::create() has been replaced with Cache::get_handler() since SimplePie 1.3.1, use the registry system instead.', \E_USER_DEPRECATED);
+
+        return self::get_handler($location, $filename, $extension);
+    }
+
+    /**
+     * Register a handler
+     *
+     * @param string $type DSN type to register for
+     * @param class-string<Base> $class Name of handler class. Must implement Base
+     */
+    public static function register($type, $class)
+    {
+        self::$handlers[$type] = $class;
+    }
+
+    /**
+     * Parse a URL into an array
+     *
+     * @param string $url
+     * @return array
+     */
+    public static function parse_URL($url)
+    {
+        $params = parse_url($url);
+        $params['extras'] = [];
+        if (isset($params['query'])) {
+            parse_str($params['query'], $params['extras']);
+        }
+        return $params;
+    }
+}
+
+class_alias('SimplePie\Cache', 'SimplePie_Cache');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCaptionphpfromrev59140trunksrcwpincludesSimplePieCaptionphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Caption.php (from rev 59140, trunk/src/wp-includes/SimplePie/Caption.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Caption.php                           (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Caption.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,197 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Handles `<media:text>` captions as defined in Media RSS.
+ *
+ * Used by {@see \SimplePie\Enclosure::get_caption()} and {@see \SimplePie\Enclosure::get_captions()}
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_caption_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Caption
+{
+    /**
+     * Content type
+     *
+     * @var string
+     * @see get_type()
+     */
+    public $type;
+
+    /**
+     * Language
+     *
+     * @var string
+     * @see get_language()
+     */
+    public $lang;
+
+    /**
+     * Start time
+     *
+     * @var string
+     * @see get_starttime()
+     */
+    public $startTime;
+
+    /**
+     * End time
+     *
+     * @var string
+     * @see get_endtime()
+     */
+    public $endTime;
+
+    /**
+     * Caption text
+     *
+     * @var string
+     * @see get_text()
+     */
+    public $text;
+
+    /**
+     * Constructor, used to input the data
+     *
+     * For documentation on all the parameters, see the corresponding
+     * properties and their accessors
+     */
+    public function __construct($type = null, $lang = null, $startTime = null, $endTime = null, $text = null)
+    {
+        $this->type = $type;
+        $this->lang = $lang;
+        $this->startTime = $startTime;
+        $this->endTime = $endTime;
+        $this->text = $text;
+    }
+
+    /**
+     * String-ified version
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        // There is no $this->data here
+        return md5(serialize($this));
+    }
+
+    /**
+     * Get the end time
+     *
+     * @return string|null Time in the format 'hh:mm:ss.SSS'
+     */
+    public function get_endtime()
+    {
+        if ($this->endTime !== null) {
+            return $this->endTime;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the language
+     *
+     * @link http://tools.ietf.org/html/rfc3066
+     * @return string|null Language code as per RFC 3066
+     */
+    public function get_language()
+    {
+        if ($this->lang !== null) {
+            return $this->lang;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the start time
+     *
+     * @return string|null Time in the format 'hh:mm:ss.SSS'
+     */
+    public function get_starttime()
+    {
+        if ($this->startTime !== null) {
+            return $this->startTime;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the text of the caption
+     *
+     * @return string|null
+     */
+    public function get_text()
+    {
+        if ($this->text !== null) {
+            return $this->text;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the content type (not MIME type)
+     *
+     * @return string|null Either 'text' or 'html'
+     */
+    public function get_type()
+    {
+        if ($this->type !== null) {
+            return $this->type;
+        }
+
+        return null;
+    }
+}
+
+class_alias('SimplePie\Caption', 'SimplePie_Caption');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCategoryphpfromrev59140trunksrcwpincludesSimplePieCategoryphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Category.php (from rev 59140, trunk/src/wp-includes/SimplePie/Category.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Category.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Category.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,166 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Manages all category-related data
+ *
+ * Used by {@see \SimplePie\Item::get_category()} and {@see \SimplePie\Item::get_categories()}
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_category_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Category
+{
+    /**
+     * Category identifier
+     *
+     * @var string|null
+     * @see get_term
+     */
+    public $term;
+
+    /**
+     * Categorization scheme identifier
+     *
+     * @var string|null
+     * @see get_scheme()
+     */
+    public $scheme;
+
+    /**
+     * Human readable label
+     *
+     * @var string|null
+     * @see get_label()
+     */
+    public $label;
+
+    /**
+     * Category type
+     *
+     * category for <category>
+     * subject for <dc:subject>
+     *
+     * @var string|null
+     * @see get_type()
+     */
+    public $type;
+
+    /**
+     * Constructor, used to input the data
+     *
+     * @param string|null $term
+     * @param string|null $scheme
+     * @param string|null $label
+     * @param string|null $type
+     */
+    public function __construct($term = null, $scheme = null, $label = null, $type = null)
+    {
+        $this->term = $term;
+        $this->scheme = $scheme;
+        $this->label = $label;
+        $this->type = $type;
+    }
+
+    /**
+     * String-ified version
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        // There is no $this->data here
+        return md5(serialize($this));
+    }
+
+    /**
+     * Get the category identifier
+     *
+     * @return string|null
+     */
+    public function get_term()
+    {
+        return $this->term;
+    }
+
+    /**
+     * Get the categorization scheme identifier
+     *
+     * @return string|null
+     */
+    public function get_scheme()
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Get the human readable label
+     *
+     * @param bool $strict
+     * @return string|null
+     */
+    public function get_label($strict = false)
+    {
+        if ($this->label === null && $strict !== true) {
+            return $this->get_term();
+        }
+        return $this->label;
+    }
+
+    /**
+     * Get the category type
+     *
+     * @return string|null
+     */
+    public function get_type()
+    {
+        return $this->type;
+    }
+}
+
+class_alias('SimplePie\Category', 'SimplePie_Category');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcContentTypeSnifferphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Content/Type/Sniffer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Content/Type/Sniffer.php  2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Content/Type/Sniffer.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Content\Type;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Content-type sniffing
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,268 +53,208 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * upon the HTML5 parsing rules.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This class can be overloaded with {@see SimplePie::set_content_type_sniffer_class()}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_content_type_sniffer_class()}
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage HTTP
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_Content_Type_Sniffer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Sniffer
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * File object
-        *
-        * @var SimplePie_File
-        */
-       var $file;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * File object
+     *
+     * @var \SimplePie\File
+     */
+    public $file;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create an instance of the class with the input file
-        *
-        * @param SimplePie_Content_Type_Sniffer $file Input file
-        */
-       public function __construct($file)
-       {
-               $this->file = $file;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Create an instance of the class with the input file
+     *
+     * @param Sniffer $file Input file
+     */
+    public function __construct($file)
+    {
+        $this->file = $file;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Get the Content-Type of the specified file
-        *
-        * @return string Actual Content-Type
-        */
-       public function get_type()
-       {
-               if (isset($this->file->headers['content-type']))
-               {
-                       if (!isset($this->file->headers['content-encoding'])
-                               && ($this->file->headers['content-type'] === 'text/plain'
-                                       || $this->file->headers['content-type'] === 'text/plain; charset=ISO-8859-1'
-                                       || $this->file->headers['content-type'] === 'text/plain; charset=iso-8859-1'
-                                       || $this->file->headers['content-type'] === 'text/plain; charset=UTF-8'))
-                       {
-                               return $this->text_or_binary();
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Get the Content-Type of the specified file
+     *
+     * @return string Actual Content-Type
+     */
+    public function get_type()
+    {
+        if (isset($this->file->headers['content-type'])) {
+            if (!isset($this->file->headers['content-encoding'])
+                && ($this->file->headers['content-type'] === 'text/plain'
+                    || $this->file->headers['content-type'] === 'text/plain; charset=ISO-8859-1'
+                    || $this->file->headers['content-type'] === 'text/plain; charset=iso-8859-1'
+                    || $this->file->headers['content-type'] === 'text/plain; charset=UTF-8')) {
+                return $this->text_or_binary();
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if (($pos = strpos($this->file->headers['content-type'], ';')) !== false)
-                       {
-                               $official = substr($this->file->headers['content-type'], 0, $pos);
-                       }
-                       else
-                       {
-                               $official = $this->file->headers['content-type'];
-                       }
-                       $official = trim(strtolower($official));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            if (($pos = strpos($this->file->headers['content-type'], ';')) !== false) {
+                $official = substr($this->file->headers['content-type'], 0, $pos);
+            } else {
+                $official = $this->file->headers['content-type'];
+            }
+            $official = trim(strtolower($official));
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ($official === 'unknown/unknown'
-                               || $official === 'application/unknown')
-                       {
-                               return $this->unknown();
-                       }
-                       elseif (substr($official, -4) === '+xml'
-                               || $official === 'text/xml'
-                               || $official === 'application/xml')
-                       {
-                               return $official;
-                       }
-                       elseif (substr($official, 0, 6) === 'image/')
-                       {
-                               if ($return = $this->image())
-                               {
-                                       return $return;
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            if ($official === 'unknown/unknown'
+                || $official === 'application/unknown') {
+                return $this->unknown();
+            } elseif (substr($official, -4) === '+xml'
+                || $official === 'text/xml'
+                || $official === 'application/xml') {
+                return $official;
+            } elseif (substr($official, 0, 6) === 'image/') {
+                if ($return = $this->image()) {
+                    return $return;
+                }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return $official;
-                       }
-                       elseif ($official === 'text/html')
-                       {
-                               return $this->feed_or_html();
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                return $official;
+            } elseif ($official === 'text/html') {
+                return $this->feed_or_html();
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return $official;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            return $official;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->unknown();
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return $this->unknown();
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Sniff text or binary
-        *
-        * @return string Actual Content-Type
-        */
-       public function text_or_binary()
-       {
-               if (substr($this->file->body, 0, 2) === "\xFE\xFF"
-                       || substr($this->file->body, 0, 2) === "\xFF\xFE"
-                       || substr($this->file->body, 0, 4) === "\x00\x00\xFE\xFF"
-                       || substr($this->file->body, 0, 3) === "\xEF\xBB\xBF")
-               {
-                       return 'text/plain';
-               }
-               elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
-               {
-                       return 'application/octet-stream';
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Sniff text or binary
+     *
+     * @return string Actual Content-Type
+     */
+    public function text_or_binary()
+    {
+        if (substr($this->file->body, 0, 2) === "\xFE\xFF"
+            || substr($this->file->body, 0, 2) === "\xFF\xFE"
+            || substr($this->file->body, 0, 4) === "\x00\x00\xFE\xFF"
+            || substr($this->file->body, 0, 3) === "\xEF\xBB\xBF") {
+            return 'text/plain';
+        } elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body)) {
+            return 'application/octet-stream';
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return 'text/plain';
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return 'text/plain';
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Sniff unknown
-        *
-        * @return string Actual Content-Type
-        */
-       public function unknown()
-       {
-               $ws = strspn($this->file->body, "\x09\x0A\x0B\x0C\x0D\x20");
-               if (strtolower(substr($this->file->body, $ws, 14)) === '<!doctype html'
-                       || strtolower(substr($this->file->body, $ws, 5)) === '<html'
-                       || strtolower(substr($this->file->body, $ws, 7)) === '<script')
-               {
-                       return 'text/html';
-               }
-               elseif (substr($this->file->body, 0, 5) === '%PDF-')
-               {
-                       return 'application/pdf';
-               }
-               elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
-               {
-                       return 'application/postscript';
-               }
-               elseif (substr($this->file->body, 0, 6) === 'GIF87a'
-                       || substr($this->file->body, 0, 6) === 'GIF89a')
-               {
-                       return 'image/gif';
-               }
-               elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
-               {
-                       return 'image/png';
-               }
-               elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
-               {
-                       return 'image/jpeg';
-               }
-               elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
-               {
-                       return 'image/bmp';
-               }
-               elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
-               {
-                       return 'image/vnd.microsoft.icon';
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Sniff unknown
+     *
+     * @return string Actual Content-Type
+     */
+    public function unknown()
+    {
+        $ws = strspn($this->file->body, "\x09\x0A\x0B\x0C\x0D\x20");
+        if (strtolower(substr($this->file->body, $ws, 14)) === '<!doctype html'
+            || strtolower(substr($this->file->body, $ws, 5)) === '<html'
+            || strtolower(substr($this->file->body, $ws, 7)) === '<script') {
+            return 'text/html';
+        } elseif (substr($this->file->body, 0, 5) === '%PDF-') {
+            return 'application/pdf';
+        } elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-') {
+            return 'application/postscript';
+        } elseif (substr($this->file->body, 0, 6) === 'GIF87a'
+            || substr($this->file->body, 0, 6) === 'GIF89a') {
+            return 'image/gif';
+        } elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A") {
+            return 'image/png';
+        } elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF") {
+            return 'image/jpeg';
+        } elseif (substr($this->file->body, 0, 2) === "\x42\x4D") {
+            return 'image/bmp';
+        } elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00") {
+            return 'image/vnd.microsoft.icon';
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $this->text_or_binary();
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return $this->text_or_binary();
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Sniff images
-        *
-        * @return string Actual Content-Type
-        */
-       public function image()
-       {
-               if (substr($this->file->body, 0, 6) === 'GIF87a'
-                       || substr($this->file->body, 0, 6) === 'GIF89a')
-               {
-                       return 'image/gif';
-               }
-               elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
-               {
-                       return 'image/png';
-               }
-               elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
-               {
-                       return 'image/jpeg';
-               }
-               elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
-               {
-                       return 'image/bmp';
-               }
-               elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
-               {
-                       return 'image/vnd.microsoft.icon';
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Sniff images
+     *
+     * @return string Actual Content-Type
+     */
+    public function image()
+    {
+        if (substr($this->file->body, 0, 6) === 'GIF87a'
+            || substr($this->file->body, 0, 6) === 'GIF89a') {
+            return 'image/gif';
+        } elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A") {
+            return 'image/png';
+        } elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF") {
+            return 'image/jpeg';
+        } elseif (substr($this->file->body, 0, 2) === "\x42\x4D") {
+            return 'image/bmp';
+        } elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00") {
+            return 'image/vnd.microsoft.icon';
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Sniff HTML
-        *
-        * @return string Actual Content-Type
-        */
-       public function feed_or_html()
-       {
-               $len = strlen($this->file->body);
-               $pos = strspn($this->file->body, "\x09\x0A\x0D\x20\xEF\xBB\xBF");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Sniff HTML
+     *
+     * @return string Actual Content-Type
+     */
+    public function feed_or_html()
+    {
+        $len = strlen($this->file->body);
+        $pos = strspn($this->file->body, "\x09\x0A\x0D\x20\xEF\xBB\xBF");
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                while ($pos < $len)
-               {
-                       switch ($this->file->body[$pos])
-                       {
-                               case "\x09":
-                               case "\x0A":
-                               case "\x0D":
-                               case "\x20":
-                                       $pos += strspn($this->file->body, "\x09\x0A\x0D\x20", $pos);
-                                       continue 2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        while ($pos < $len) {
+            switch ($this->file->body[$pos]) {
+                case "\x09":
+                case "\x0A":
+                case "\x0D":
+                case "\x20":
+                    $pos += strspn($this->file->body, "\x09\x0A\x0D\x20", $pos);
+                    continue 2;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '<':
-                                       $pos++;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                case '<':
+                    $pos++;
+                    break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                default:
-                                       return 'text/html';
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                default:
+                    return 'text/html';
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if (substr($this->file->body, $pos, 3) === '!--')
-                       {
-                               $pos += 3;
-                               if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false)
-                               {
-                                       $pos += 3;
-                               }
-                               else
-                               {
-                                       return 'text/html';
-                               }
-                       }
-                       elseif (substr($this->file->body, $pos, 1) === '!')
-                       {
-                               if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false)
-                               {
-                                       $pos++;
-                               }
-                               else
-                               {
-                                       return 'text/html';
-                               }
-                       }
-                       elseif (substr($this->file->body, $pos, 1) === '?')
-                       {
-                               if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false)
-                               {
-                                       $pos += 2;
-                               }
-                               else
-                               {
-                                       return 'text/html';
-                               }
-                       }
-                       elseif (substr($this->file->body, $pos, 3) === 'rss'
-                               || substr($this->file->body, $pos, 7) === 'rdf:RDF')
-                       {
-                               return 'application/rss+xml';
-                       }
-                       elseif (substr($this->file->body, $pos, 4) === 'feed')
-                       {
-                               return 'application/atom+xml';
-                       }
-                       else
-                       {
-                               return 'text/html';
-                       }
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            if (substr($this->file->body, $pos, 3) === '!--') {
+                $pos += 3;
+                if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false) {
+                    $pos += 3;
+                } else {
+                    return 'text/html';
+                }
+            } elseif (substr($this->file->body, $pos, 1) === '!') {
+                if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false) {
+                    $pos++;
+                } else {
+                    return 'text/html';
+                }
+            } elseif (substr($this->file->body, $pos, 1) === '?') {
+                if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false) {
+                    $pos += 2;
+                } else {
+                    return 'text/html';
+                }
+            } elseif (substr($this->file->body, $pos, 3) === 'rss'
+                || substr($this->file->body, $pos, 7) === 'rdf:RDF') {
+                return 'application/rss+xml';
+            } elseif (substr($this->file->body, $pos, 4) === 'feed') {
+                return 'application/atom+xml';
+            } else {
+                return 'text/html';
+            }
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return 'text/html';
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return 'text/html';
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\Content\Type\Sniffer', 'SimplePie_Content_Type_Sniffer');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCopyrightphpfromrev59140trunksrcwpincludesSimplePieCopyrightphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Copyright.php (from rev 59140, trunk/src/wp-includes/SimplePie/Copyright.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Copyright.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Copyright.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,127 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Manages `<media:copyright>` copyright tags as defined in Media RSS
+ *
+ * Used by {@see \SimplePie\Enclosure::get_copyright()}
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_copyright_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Copyright
+{
+    /**
+     * Copyright URL
+     *
+     * @var string
+     * @see get_url()
+     */
+    public $url;
+
+    /**
+     * Attribution
+     *
+     * @var string
+     * @see get_attribution()
+     */
+    public $label;
+
+    /**
+     * Constructor, used to input the data
+     *
+     * For documentation on all the parameters, see the corresponding
+     * properties and their accessors
+     */
+    public function __construct($url = null, $label = null)
+    {
+        $this->url = $url;
+        $this->label = $label;
+    }
+
+    /**
+     * String-ified version
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        // There is no $this->data here
+        return md5(serialize($this));
+    }
+
+    /**
+     * Get the copyright URL
+     *
+     * @return string|null URL to copyright information
+     */
+    public function get_url()
+    {
+        if ($this->url !== null) {
+            return $this->url;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the attribution text
+     *
+     * @return string|null
+     */
+    public function get_attribution()
+    {
+        if ($this->label !== null) {
+            return $this->label;
+        }
+
+        return null;
+    }
+}
+
+class_alias('SimplePie\Copyright', 'SimplePie_Copyright');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCorephpfromrev59140trunksrcwpincludesSimplePieCorephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Core.php (from rev 59140, trunk/src/wp-includes/SimplePie/Core.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Core.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Core.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,56 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * SimplePie class.
+ *
+ * Class for backward compatibility.
+ *
+ * @deprecated Use {@see SimplePie} directly
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Core extends SimplePie
+{
+
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcCreditphpfromrev59140trunksrcwpincludesSimplePieCreditphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Credit.php (from rev 59140, trunk/src/wp-includes/SimplePie/Credit.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Credit.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Credit.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,150 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Handles `<media:credit>` as defined in Media RSS
+ *
+ * Used by {@see \SimplePie\Enclosure::get_credit()} and {@see \SimplePie\Enclosure::get_credits()}
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_credit_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Credit
+{
+    /**
+     * Credited role
+     *
+     * @var string
+     * @see get_role()
+     */
+    public $role;
+
+    /**
+     * Organizational scheme
+     *
+     * @var string
+     * @see get_scheme()
+     */
+    public $scheme;
+
+    /**
+     * Credited name
+     *
+     * @var string
+     * @see get_name()
+     */
+    public $name;
+
+    /**
+     * Constructor, used to input the data
+     *
+     * For documentation on all the parameters, see the corresponding
+     * properties and their accessors
+     */
+    public function __construct($role = null, $scheme = null, $name = null)
+    {
+        $this->role = $role;
+        $this->scheme = $scheme;
+        $this->name = $name;
+    }
+
+    /**
+     * String-ified version
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        // There is no $this->data here
+        return md5(serialize($this));
+    }
+
+    /**
+     * Get the role of the person receiving credit
+     *
+     * @return string|null
+     */
+    public function get_role()
+    {
+        if ($this->role !== null) {
+            return $this->role;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the organizational scheme
+     *
+     * @return string|null
+     */
+    public function get_scheme()
+    {
+        if ($this->scheme !== null) {
+            return $this->scheme;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the credited person/entity's name
+     *
+     * @return string|null
+     */
+    public function get_name()
+    {
+        if ($this->name !== null) {
+            return $this->name;
+        }
+
+        return null;
+    }
+}
+
+class_alias('SimplePie\Credit', 'SimplePie_Credit');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcEnclosurephpfromrev59140trunksrcwpincludesSimplePieEnclosurephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Enclosure.php (from rev 59140, trunk/src/wp-includes/SimplePie/Enclosure.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Enclosure.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Enclosure.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,1211 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Handles everything related to enclosures (including Media RSS and iTunes RSS)
+ *
+ * Used by {@see \SimplePie\Item::get_enclosure()} and {@see \SimplePie\Item::get_enclosures()}
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_enclosure_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Enclosure
+{
+    /**
+     * @var string
+     * @see get_bitrate()
+     */
+    public $bitrate;
+
+    /**
+     * @var array
+     * @see get_captions()
+     */
+    public $captions;
+
+    /**
+     * @var array
+     * @see get_categories()
+     */
+    public $categories;
+
+    /**
+     * @var int
+     * @see get_channels()
+     */
+    public $channels;
+
+    /**
+     * @var \SimplePie\Copyright
+     * @see get_copyright()
+     */
+    public $copyright;
+
+    /**
+     * @var array
+     * @see get_credits()
+     */
+    public $credits;
+
+    /**
+     * @var string
+     * @see get_description()
+     */
+    public $description;
+
+    /**
+     * @var int
+     * @see get_duration()
+     */
+    public $duration;
+
+    /**
+     * @var string
+     * @see get_expression()
+     */
+    public $expression;
+
+    /**
+     * @var string
+     * @see get_framerate()
+     */
+    public $framerate;
+
+    /**
+     * @var string
+     * @see get_handler()
+     */
+    public $handler;
+
+    /**
+     * @var array
+     * @see get_hashes()
+     */
+    public $hashes;
+
+    /**
+     * @var string
+     * @see get_height()
+     */
+    public $height;
+
+    /**
+     * @deprecated
+     * @var null
+     */
+    public $javascript;
+
+    /**
+     * @var array
+     * @see get_keywords()
+     */
+    public $keywords;
+
+    /**
+     * @var string
+     * @see get_language()
+     */
+    public $lang;
+
+    /**
+     * @var string
+     * @see get_length()
+     */
+    public $length;
+
+    /**
+     * @var string
+     * @see get_link()
+     */
+    public $link;
+
+    /**
+     * @var string
+     * @see get_medium()
+     */
+    public $medium;
+
+    /**
+     * @var string
+     * @see get_player()
+     */
+    public $player;
+
+    /**
+     * @var array
+     * @see get_ratings()
+     */
+    public $ratings;
+
+    /**
+     * @var array
+     * @see get_restrictions()
+     */
+    public $restrictions;
+
+    /**
+     * @var string
+     * @see get_sampling_rate()
+     */
+    public $samplingrate;
+
+    /**
+     * @var array
+     * @see get_thumbnails()
+     */
+    public $thumbnails;
+
+    /**
+     * @var string
+     * @see get_title()
+     */
+    public $title;
+
+    /**
+     * @var string
+     * @see get_type()
+     */
+    public $type;
+
+    /**
+     * @var string
+     * @see get_width()
+     */
+    public $width;
+
+    /**
+     * Constructor, used to input the data
+     *
+     * For documentation on all the parameters, see the corresponding
+     * properties and their accessors
+     *
+     * @uses idna_convert If available, this will convert an IDN
+     */
+    public function __construct($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
+    {
+        $this->bitrate = $bitrate;
+        $this->captions = $captions;
+        $this->categories = $categories;
+        $this->channels = $channels;
+        $this->copyright = $copyright;
+        $this->credits = $credits;
+        $this->description = $description;
+        $this->duration = $duration;
+        $this->expression = $expression;
+        $this->framerate = $framerate;
+        $this->hashes = $hashes;
+        $this->height = $height;
+        $this->keywords = $keywords;
+        $this->lang = $lang;
+        $this->length = $length;
+        $this->link = $link;
+        $this->medium = $medium;
+        $this->player = $player;
+        $this->ratings = $ratings;
+        $this->restrictions = $restrictions;
+        $this->samplingrate = $samplingrate;
+        $this->thumbnails = $thumbnails;
+        $this->title = $title;
+        $this->type = $type;
+        $this->width = $width;
+
+        if (class_exists('idna_convert')) {
+            $idn = new \idna_convert();
+            $parsed = \SimplePie\Misc::parse_url($link);
+            $this->link = \SimplePie\Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
+        }
+        $this->handler = $this->get_handler(); // Needs to load last
+    }
+
+    /**
+     * String-ified version
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        // There is no $this->data here
+        return md5(serialize($this));
+    }
+
+    /**
+     * Get the bitrate
+     *
+     * @return string|null
+     */
+    public function get_bitrate()
+    {
+        if ($this->bitrate !== null) {
+            return $this->bitrate;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single caption
+     *
+     * @param int $key
+     * @return \SimplePie\Caption|null
+     */
+    public function get_caption($key = 0)
+    {
+        $captions = $this->get_captions();
+        if (isset($captions[$key])) {
+            return $captions[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all captions
+     *
+     * @return array|null Array of {@see \SimplePie\Caption} objects
+     */
+    public function get_captions()
+    {
+        if ($this->captions !== null) {
+            return $this->captions;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single category
+     *
+     * @param int $key
+     * @return \SimplePie\Category|null
+     */
+    public function get_category($key = 0)
+    {
+        $categories = $this->get_categories();
+        if (isset($categories[$key])) {
+            return $categories[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all categories
+     *
+     * @return array|null Array of {@see \SimplePie\Category} objects
+     */
+    public function get_categories()
+    {
+        if ($this->categories !== null) {
+            return $this->categories;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the number of audio channels
+     *
+     * @return int|null
+     */
+    public function get_channels()
+    {
+        if ($this->channels !== null) {
+            return $this->channels;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the copyright information
+     *
+     * @return \SimplePie\Copyright|null
+     */
+    public function get_copyright()
+    {
+        if ($this->copyright !== null) {
+            return $this->copyright;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single credit
+     *
+     * @param int $key
+     * @return \SimplePie\Credit|null
+     */
+    public function get_credit($key = 0)
+    {
+        $credits = $this->get_credits();
+        if (isset($credits[$key])) {
+            return $credits[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all credits
+     *
+     * @return array|null Array of {@see \SimplePie\Credit} objects
+     */
+    public function get_credits()
+    {
+        if ($this->credits !== null) {
+            return $this->credits;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the description of the enclosure
+     *
+     * @return string|null
+     */
+    public function get_description()
+    {
+        if ($this->description !== null) {
+            return $this->description;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the duration of the enclosure
+     *
+     * @param bool $convert Convert seconds into hh:mm:ss
+     * @return string|int|null 'hh:mm:ss' string if `$convert` was specified, otherwise integer (or null if none found)
+     */
+    public function get_duration($convert = false)
+    {
+        if ($this->duration !== null) {
+            if ($convert) {
+                $time = \SimplePie\Misc::time_hms($this->duration);
+                return $time;
+            }
+
+            return $this->duration;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the expression
+     *
+     * @return string Probably one of 'sample', 'full', 'nonstop', 'clip'. Defaults to 'full'
+     */
+    public function get_expression()
+    {
+        if ($this->expression !== null) {
+            return $this->expression;
+        }
+
+        return 'full';
+    }
+
+    /**
+     * Get the file extension
+     *
+     * @return string|null
+     */
+    public function get_extension()
+    {
+        if ($this->link !== null) {
+            $url = \SimplePie\Misc::parse_url($this->link);
+            if ($url['path'] !== '') {
+                return pathinfo($url['path'], PATHINFO_EXTENSION);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get the framerate (in frames-per-second)
+     *
+     * @return string|null
+     */
+    public function get_framerate()
+    {
+        if ($this->framerate !== null) {
+            return $this->framerate;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the preferred handler
+     *
+     * @return string|null One of 'flash', 'fmedia', 'quicktime', 'wmedia', 'mp3'
+     */
+    public function get_handler()
+    {
+        return $this->get_real_type(true);
+    }
+
+    /**
+     * Get a single hash
+     *
+     * @link http://www.rssboard.org/media-rss#media-hash
+     * @param int $key
+     * @return string|null Hash as per `media:hash`, prefixed with "$algo:"
+     */
+    public function get_hash($key = 0)
+    {
+        $hashes = $this->get_hashes();
+        if (isset($hashes[$key])) {
+            return $hashes[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all credits
+     *
+     * @return array|null Array of strings, see {@see get_hash()}
+     */
+    public function get_hashes()
+    {
+        if ($this->hashes !== null) {
+            return $this->hashes;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the height
+     *
+     * @return string|null
+     */
+    public function get_height()
+    {
+        if ($this->height !== null) {
+            return $this->height;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the language
+     *
+     * @link http://tools.ietf.org/html/rfc3066
+     * @return string|null Language code as per RFC 3066
+     */
+    public function get_language()
+    {
+        if ($this->lang !== null) {
+            return $this->lang;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single keyword
+     *
+     * @param int $key
+     * @return string|null
+     */
+    public function get_keyword($key = 0)
+    {
+        $keywords = $this->get_keywords();
+        if (isset($keywords[$key])) {
+            return $keywords[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all keywords
+     *
+     * @return array|null Array of strings
+     */
+    public function get_keywords()
+    {
+        if ($this->keywords !== null) {
+            return $this->keywords;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get length
+     *
+     * @return float Length in bytes
+     */
+    public function get_length()
+    {
+        if ($this->length !== null) {
+            return $this->length;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the URL
+     *
+     * @return string|null
+     */
+    public function get_link()
+    {
+        if ($this->link !== null) {
+            return $this->link;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the medium
+     *
+     * @link http://www.rssboard.org/media-rss#media-content
+     * @return string|null Should be one of 'image', 'audio', 'video', 'document', 'executable'
+     */
+    public function get_medium()
+    {
+        if ($this->medium !== null) {
+            return $this->medium;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the player URL
+     *
+     * Typically the same as {@see get_permalink()}
+     * @return string|null Player URL
+     */
+    public function get_player()
+    {
+        if ($this->player !== null) {
+            return $this->player;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single rating
+     *
+     * @param int $key
+     * @return \SimplePie\Rating|null
+     */
+    public function get_rating($key = 0)
+    {
+        $ratings = $this->get_ratings();
+        if (isset($ratings[$key])) {
+            return $ratings[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all ratings
+     *
+     * @return array|null Array of {@see \SimplePie\Rating} objects
+     */
+    public function get_ratings()
+    {
+        if ($this->ratings !== null) {
+            return $this->ratings;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single restriction
+     *
+     * @param int $key
+     * @return \SimplePie\Restriction|null
+     */
+    public function get_restriction($key = 0)
+    {
+        $restrictions = $this->get_restrictions();
+        if (isset($restrictions[$key])) {
+            return $restrictions[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all restrictions
+     *
+     * @return array|null Array of {@see \SimplePie\Restriction} objects
+     */
+    public function get_restrictions()
+    {
+        if ($this->restrictions !== null) {
+            return $this->restrictions;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the sampling rate (in kHz)
+     *
+     * @return string|null
+     */
+    public function get_sampling_rate()
+    {
+        if ($this->samplingrate !== null) {
+            return $this->samplingrate;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the file size (in MiB)
+     *
+     * @return float|null File size in mebibytes (1048 bytes)
+     */
+    public function get_size()
+    {
+        $length = $this->get_length();
+        if ($length !== null) {
+            return round($length / 1048576, 2);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single thumbnail
+     *
+     * @param int $key
+     * @return string|null Thumbnail URL
+     */
+    public function get_thumbnail($key = 0)
+    {
+        $thumbnails = $this->get_thumbnails();
+        if (isset($thumbnails[$key])) {
+            return $thumbnails[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all thumbnails
+     *
+     * @return array|null Array of thumbnail URLs
+     */
+    public function get_thumbnails()
+    {
+        if ($this->thumbnails !== null) {
+            return $this->thumbnails;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the title
+     *
+     * @return string|null
+     */
+    public function get_title()
+    {
+        if ($this->title !== null) {
+            return $this->title;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get mimetype of the enclosure
+     *
+     * @see get_real_type()
+     * @return string|null MIME type
+     */
+    public function get_type()
+    {
+        if ($this->type !== null) {
+            return $this->type;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the width
+     *
+     * @return string|null
+     */
+    public function get_width()
+    {
+        if ($this->width !== null) {
+            return $this->width;
+        }
+
+        return null;
+    }
+
+    /**
+     * Embed the enclosure using `<embed>`
+     *
+     * @deprecated Use the second parameter to {@see embed} instead
+     *
+     * @param array|string $options See first parameter to {@see embed}
+     * @return string HTML string to output
+     */
+    public function native_embed($options = '')
+    {
+        return $this->embed($options, true);
+    }
+
+    /**
+     * Embed the enclosure using Javascript
+     *
+     * `$options` is an array or comma-separated key:value string, with the
+     * following properties:
+     *
+     * - `alt` (string): Alternate content for when an end-user does not have
+     *    the appropriate handler installed or when a file type is
+     *    unsupported. Can be any text or HTML. Defaults to blank.
+     * - `altclass` (string): If a file type is unsupported, the end-user will
+     *    see the alt text (above) linked directly to the content. That link
+     *    will have this value as its class name. Defaults to blank.
+     * - `audio` (string): This is an image that should be used as a
+     *    placeholder for audio files before they're loaded (QuickTime-only).
+     *    Can be any relative or absolute URL. Defaults to blank.
+     * - `bgcolor` (string): The background color for the media, if not
+     *    already transparent. Defaults to `#ffffff`.
+     * - `height` (integer): The height of the embedded media. Accepts any
+     *    numeric pixel value (such as `360`) or `auto`. Defaults to `auto`,
+     *    and it is recommended that you use this default.
+     * - `loop` (boolean): Do you want the media to loop when it's done?
+     *    Defaults to `false`.
+     * - `mediaplayer` (string): The location of the included
+     *    `mediaplayer.swf` file. This allows for the playback of Flash Video
+     *    (`.flv`) files, and is the default handler for non-Odeo MP3's.
+     *    Defaults to blank.
+     * - `video` (string): This is an image that should be used as a
+     *    placeholder for video files before they're loaded (QuickTime-only).
+     *    Can be any relative or absolute URL. Defaults to blank.
+     * - `width` (integer): The width of the embedded media. Accepts any
+     *    numeric pixel value (such as `480`) or `auto`. Defaults to `auto`,
+     *    and it is recommended that you use this default.
+     * - `widescreen` (boolean): Is the enclosure widescreen or standard?
+     *    This applies only to video enclosures, and will automatically resize
+     *    the content appropriately.  Defaults to `false`, implying 4:3 mode.
+     *
+     * Note: Non-widescreen (4:3) mode with `width` and `height` set to `auto`
+     * will default to 480x360 video resolution.  Widescreen (16:9) mode with
+     * `width` and `height` set to `auto` will default to 480x270 video resolution.
+     *
+     * @todo If the dimensions for media:content are defined, use them when width/height are set to 'auto'.
+     * @param array|string $options Comma-separated key:value list, or array
+     * @param bool $native Use `<embed>`
+     * @return string HTML string to output
+     */
+    public function embed($options = '', $native = false)
+    {
+        // Set up defaults
+        $audio = '';
+        $video = '';
+        $alt = '';
+        $altclass = '';
+        $loop = 'false';
+        $width = 'auto';
+        $height = 'auto';
+        $bgcolor = '#ffffff';
+        $mediaplayer = '';
+        $widescreen = false;
+        $handler = $this->get_handler();
+        $type = $this->get_real_type();
+        $placeholder = '';
+
+        // Process options and reassign values as necessary
+        if (is_array($options)) {
+            extract($options);
+        } else {
+            $options = explode(',', $options);
+            foreach ($options as $option) {
+                $opt = explode(':', $option, 2);
+                if (isset($opt[0], $opt[1])) {
+                    $opt[0] = trim($opt[0]);
+                    $opt[1] = trim($opt[1]);
+                    switch ($opt[0]) {
+                        case 'audio':
+                            $audio = $opt[1];
+                            break;
+
+                        case 'video':
+                            $video = $opt[1];
+                            break;
+
+                        case 'alt':
+                            $alt = $opt[1];
+                            break;
+
+                        case 'altclass':
+                            $altclass = $opt[1];
+                            break;
+
+                        case 'loop':
+                            $loop = $opt[1];
+                            break;
+
+                        case 'width':
+                            $width = $opt[1];
+                            break;
+
+                        case 'height':
+                            $height = $opt[1];
+                            break;
+
+                        case 'bgcolor':
+                            $bgcolor = $opt[1];
+                            break;
+
+                        case 'mediaplayer':
+                            $mediaplayer = $opt[1];
+                            break;
+
+                        case 'widescreen':
+                            $widescreen = $opt[1];
+                            break;
+                    }
+                }
+            }
+        }
+
+        $mime = explode('/', $type, 2);
+        $mime = $mime[0];
+
+        // Process values for 'auto'
+        if ($width === 'auto') {
+            if ($mime === 'video') {
+                if ($height === 'auto') {
+                    $width = 480;
+                } elseif ($widescreen) {
+                    $width = round((intval($height) / 9) * 16);
+                } else {
+                    $width = round((intval($height) / 3) * 4);
+                }
+            } else {
+                $width = '100%';
+            }
+        }
+
+        if ($height === 'auto') {
+            if ($mime === 'audio') {
+                $height = 0;
+            } elseif ($mime === 'video') {
+                if ($width === 'auto') {
+                    if ($widescreen) {
+                        $height = 270;
+                    } else {
+                        $height = 360;
+                    }
+                } elseif ($widescreen) {
+                    $height = round((intval($width) / 16) * 9);
+                } else {
+                    $height = round((intval($width) / 4) * 3);
+                }
+            } else {
+                $height = 376;
+            }
+        } elseif ($mime === 'audio') {
+            $height = 0;
+        }
+
+        // Set proper placeholder value
+        if ($mime === 'audio') {
+            $placeholder = $audio;
+        } elseif ($mime === 'video') {
+            $placeholder = $video;
+        }
+
+        $embed = '';
+
+        // Flash
+        if ($handler === 'flash') {
+            if ($native) {
+                $embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
+            } else {
+                $embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+            }
+        }
+
+        // Flash Media Player file types.
+        // Preferred handler for MP3 file types.
+        elseif ($handler === 'fmedia' || ($handler === 'mp3' && $mediaplayer !== '')) {
+            $height += 20;
+            if ($native) {
+                $embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
+            } else {
+                $embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+            }
+        }
+
+        // QuickTime 7 file types.  Need to test with QuickTime 6.
+        // Only handle MP3's if the Flash Media Player is not present.
+        elseif ($handler === 'quicktime' || ($handler === 'mp3' && $mediaplayer === '')) {
+            $height += 16;
+            if ($native) {
+                if ($placeholder !== '') {
+                    $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+                } else {
+                    $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+                }
+            } else {
+                $embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+            }
+        }
+
+        // Windows Media
+        elseif ($handler === 'wmedia') {
+            $height += 45;
+            if ($native) {
+                $embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
+            } else {
+                $embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+            }
+        }
+
+        // Everything else
+        else {
+            $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+        }
+
+        return $embed;
+    }
+
+    /**
+     * Get the real media type
+     *
+     * Often, feeds lie to us, necessitating a bit of deeper inspection. This
+     * converts types to their canonical representations based on the file
+     * extension
+     *
+     * @see get_type()
+     * @param bool $find_handler Internal use only, use {@see get_handler()} instead
+     * @return string MIME type
+     */
+    public function get_real_type($find_handler = false)
+    {
+        // Mime-types by handler.
+        $types_flash = ['application/x-shockwave-flash', 'application/futuresplash']; // Flash
+        $types_fmedia = ['video/flv', 'video/x-flv','flv-application/octet-stream']; // Flash Media Player
+        $types_quicktime = ['audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video']; // QuickTime
+        $types_wmedia = ['application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx']; // Windows Media
+        $types_mp3 = ['audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg']; // MP3
+
+        if ($this->get_type() !== null) {
+            $type = strtolower($this->type);
+        } else {
+            $type = null;
+        }
+
+        // If we encounter an unsupported mime-type, check the file extension and guess intelligently.
+        if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3))) {
+            $extension = $this->get_extension();
+            if ($extension === null) {
+                return null;
+            }
+
+            switch (strtolower($extension)) {
+                // Audio mime-types
+                case 'aac':
+                case 'adts':
+                    $type = 'audio/acc';
+                    break;
+
+                case 'aif':
+                case 'aifc':
+                case 'aiff':
+                case 'cdda':
+                    $type = 'audio/aiff';
+                    break;
+
+                case 'bwf':
+                    $type = 'audio/wav';
+                    break;
+
+                case 'kar':
+                case 'mid':
+                case 'midi':
+                case 'smf':
+                    $type = 'audio/midi';
+                    break;
+
+                case 'm4a':
+                    $type = 'audio/x-m4a';
+                    break;
+
+                case 'mp3':
+                case 'swa':
+                    $type = 'audio/mp3';
+                    break;
+
+                case 'wav':
+                    $type = 'audio/wav';
+                    break;
+
+                case 'wax':
+                    $type = 'audio/x-ms-wax';
+                    break;
+
+                case 'wma':
+                    $type = 'audio/x-ms-wma';
+                    break;
+
+                    // Video mime-types
+                case '3gp':
+                case '3gpp':
+                    $type = 'video/3gpp';
+                    break;
+
+                case '3g2':
+                case '3gp2':
+                    $type = 'video/3gpp2';
+                    break;
+
+                case 'asf':
+                    $type = 'video/x-ms-asf';
+                    break;
+
+                case 'flv':
+                    $type = 'video/x-flv';
+                    break;
+
+                case 'm1a':
+                case 'm1s':
+                case 'm1v':
+                case 'm15':
+                case 'm75':
+                case 'mp2':
+                case 'mpa':
+                case 'mpeg':
+                case 'mpg':
+                case 'mpm':
+                case 'mpv':
+                    $type = 'video/mpeg';
+                    break;
+
+                case 'm4v':
+                    $type = 'video/x-m4v';
+                    break;
+
+                case 'mov':
+                case 'qt':
+                    $type = 'video/quicktime';
+                    break;
+
+                case 'mp4':
+                case 'mpg4':
+                    $type = 'video/mp4';
+                    break;
+
+                case 'sdv':
+                    $type = 'video/sd-video';
+                    break;
+
+                case 'wm':
+                    $type = 'video/x-ms-wm';
+                    break;
+
+                case 'wmv':
+                    $type = 'video/x-ms-wmv';
+                    break;
+
+                case 'wvx':
+                    $type = 'video/x-ms-wvx';
+                    break;
+
+                    // Flash mime-types
+                case 'spl':
+                    $type = 'application/futuresplash';
+                    break;
+
+                case 'swf':
+                    $type = 'application/x-shockwave-flash';
+                    break;
+            }
+        }
+
+        if ($find_handler) {
+            if (in_array($type, $types_flash)) {
+                return 'flash';
+            } elseif (in_array($type, $types_fmedia)) {
+                return 'fmedia';
+            } elseif (in_array($type, $types_quicktime)) {
+                return 'quicktime';
+            } elseif (in_array($type, $types_wmedia)) {
+                return 'wmedia';
+            } elseif (in_array($type, $types_mp3)) {
+                return 'mp3';
+            }
+
+            return null;
+        }
+
+        return $type;
+    }
+}
+
+class_alias('SimplePie\Enclosure', 'SimplePie_Enclosure');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcExceptionphpfromrev59140trunksrcwpincludesSimplePieExceptionphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Exception.php (from rev 59140, trunk/src/wp-includes/SimplePie/Exception.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Exception.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Exception.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,58 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+use Exception as NativeException;
+
+/**
+ * General SimplePie exception class
+ *
+ * @package SimplePie
+ */
+class Exception extends NativeException
+{
+}
+
+class_alias('SimplePie\Exception', 'SimplePie_Exception');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcFilephpfromrev59140trunksrcwpincludesSimplePieFilephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/File.php (from rev 59140, trunk/src/wp-includes/SimplePie/File.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/File.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/File.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,256 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Used for fetching remote files and reading local files
+ *
+ * Supports HTTP 1.0 via cURL or fsockopen, with spotty HTTP 1.1 support
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_file_class()}
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @todo Move to properly supporting RFC2616 (HTTP/1.1)
+ */
+class File
+{
+    public $url;
+    public $useragent;
+    public $success = true;
+    public $headers = [];
+    public $body;
+    public $status_code = 0;
+    public $redirects = 0;
+    public $error;
+    public $method = \SimplePie\SimplePie::FILE_SOURCE_NONE;
+    public $permanent_url;
+
+    public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false, $curl_options = [])
+    {
+        if (class_exists('idna_convert')) {
+            $idn = new \idna_convert();
+            $parsed = \SimplePie\Misc::parse_url($url);
+            $url = \SimplePie\Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], null);
+        }
+        $this->url = $url;
+        $this->permanent_url = $url;
+        $this->useragent = $useragent;
+        if (preg_match('/^http(s)?:\/\//i', $url)) {
+            if ($useragent === null) {
+                $useragent = ini_get('user_agent');
+                $this->useragent = $useragent;
+            }
+            if (!is_array($headers)) {
+                $headers = [];
+            }
+            if (!$force_fsockopen && function_exists('curl_exec')) {
+                $this->method = \SimplePie\SimplePie::FILE_SOURCE_REMOTE | \SimplePie\SimplePie::FILE_SOURCE_CURL;
+                $fp = curl_init();
+                $headers2 = [];
+                foreach ($headers as $key => $value) {
+                    $headers2[] = "$key: $value";
+                }
+                if (version_compare(\SimplePie\Misc::get_curl_version(), '7.10.5', '>=')) {
+                    curl_setopt($fp, CURLOPT_ENCODING, '');
+                }
+                curl_setopt($fp, CURLOPT_URL, $url);
+                curl_setopt($fp, CURLOPT_HEADER, 1);
+                curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
+                curl_setopt($fp, CURLOPT_FAILONERROR, 1);
+                curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);
+                curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout);
+                curl_setopt($fp, CURLOPT_REFERER, \SimplePie\Misc::url_remove_credentials($url));
+                curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
+                curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
+                foreach ($curl_options as $curl_param => $curl_value) {
+                    curl_setopt($fp, $curl_param, $curl_value);
+                }
+
+                $this->headers = curl_exec($fp);
+                if (curl_errno($fp) === 23 || curl_errno($fp) === 61) {
+                    curl_setopt($fp, CURLOPT_ENCODING, 'none');
+                    $this->headers = curl_exec($fp);
+                }
+                $this->status_code = curl_getinfo($fp, CURLINFO_HTTP_CODE);
+                if (curl_errno($fp)) {
+                    $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+                    $this->success = false;
+                } else {
+                    // Use the updated url provided by curl_getinfo after any redirects.
+                    if ($info = curl_getinfo($fp)) {
+                        $this->url = $info['url'];
+                    }
+                    curl_close($fp);
+                    $this->headers = \SimplePie\HTTP\Parser::prepareHeaders($this->headers, $info['redirect_count'] + 1);
+                    $parser = new \SimplePie\HTTP\Parser($this->headers);
+                    if ($parser->parse()) {
+                        $this->headers = $parser->headers;
+                        $this->body = trim($parser->body);
+                        $this->status_code = $parser->status_code;
+                        if ((in_array($this->status_code, [300, 301, 302, 303, 307]) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects) {
+                            $this->redirects++;
+                            $location = \SimplePie\Misc::absolutize_url($this->headers['location'], $url);
+                            $previousStatusCode = $this->status_code;
+                            $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen, $curl_options);
+                            $this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
+                            return;
+                        }
+                    }
+                }
+            } else {
+                $this->method = \SimplePie\SimplePie::FILE_SOURCE_REMOTE | \SimplePie\SimplePie::FILE_SOURCE_FSOCKOPEN;
+                $url_parts = parse_url($url);
+                $socket_host = $url_parts['host'];
+                if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') {
+                    $socket_host = "ssl://$url_parts[host]";
+                    $url_parts['port'] = 443;
+                }
+                if (!isset($url_parts['port'])) {
+                    $url_parts['port'] = 80;
+                }
+                $fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
+                if (!$fp) {
+                    $this->error = 'fsockopen error: ' . $errstr;
+                    $this->success = false;
+                } else {
+                    stream_set_timeout($fp, $timeout);
+                    if (isset($url_parts['path'])) {
+                        if (isset($url_parts['query'])) {
+                            $get = "$url_parts[path]?$url_parts[query]";
+                        } else {
+                            $get = $url_parts['path'];
+                        }
+                    } else {
+                        $get = '/';
+                    }
+                    $out = "GET $get HTTP/1.1\r\n";
+                    $out .= "Host: $url_parts[host]\r\n";
+                    $out .= "User-Agent: $useragent\r\n";
+                    if (extension_loaded('zlib')) {
+                        $out .= "Accept-Encoding: x-gzip,gzip,deflate\r\n";
+                    }
+
+                    if (isset($url_parts['user']) && isset($url_parts['pass'])) {
+                        $out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+                    }
+                    foreach ($headers as $key => $value) {
+                        $out .= "$key: $value\r\n";
+                    }
+                    $out .= "Connection: Close\r\n\r\n";
+                    fwrite($fp, $out);
+
+                    $info = stream_get_meta_data($fp);
+
+                    $this->headers = '';
+                    while (!$info['eof'] && !$info['timed_out']) {
+                        $this->headers .= fread($fp, 1160);
+                        $info = stream_get_meta_data($fp);
+                    }
+                    if (!$info['timed_out']) {
+                        $parser = new \SimplePie\HTTP\Parser($this->headers);
+                        if ($parser->parse()) {
+                            $this->headers = $parser->headers;
+                            $this->body = $parser->body;
+                            $this->status_code = $parser->status_code;
+                            if ((in_array($this->status_code, [300, 301, 302, 303, 307]) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects) {
+                                $this->redirects++;
+                                $location = \SimplePie\Misc::absolutize_url($this->headers['location'], $url);
+                                $previousStatusCode = $this->status_code;
+                                $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen, $curl_options);
+                                $this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
+                                return;
+                            }
+                            if (isset($this->headers['content-encoding'])) {
+                                // Hey, we act dumb elsewhere, so let's do that here too
+                                switch (strtolower(trim($this->headers['content-encoding'], "\x09\x0A\x0D\x20"))) {
+                                    case 'gzip':
+                                    case 'x-gzip':
+                                        $decoder = new \SimplePie\Gzdecode($this->body);
+                                        if (!$decoder->parse()) {
+                                            $this->error = 'Unable to decode HTTP "gzip" stream';
+                                            $this->success = false;
+                                        } else {
+                                            $this->body = trim($decoder->data);
+                                        }
+                                        break;
+
+                                    case 'deflate':
+                                        if (($decompressed = gzinflate($this->body)) !== false) {
+                                            $this->body = $decompressed;
+                                        } elseif (($decompressed = gzuncompress($this->body)) !== false) {
+                                            $this->body = $decompressed;
+                                        } elseif (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false) {
+                                            $this->body = $decompressed;
+                                        } else {
+                                            $this->error = 'Unable to decode HTTP "deflate" stream';
+                                            $this->success = false;
+                                        }
+                                        break;
+
+                                    default:
+                                        $this->error = 'Unknown content coding';
+                                        $this->success = false;
+                                }
+                            }
+                        }
+                    } else {
+                        $this->error = 'fsocket timed out';
+                        $this->success = false;
+                    }
+                    fclose($fp);
+                }
+            }
+        } else {
+            $this->method = \SimplePie\SimplePie::FILE_SOURCE_LOCAL | \SimplePie\SimplePie::FILE_SOURCE_FILE_GET_CONTENTS;
+            if (empty($url) || !($this->body = trim(file_get_contents($url)))) {
+                $this->error = 'file_get_contents could not read the file';
+                $this->success = false;
+            }
+        }
+    }
+}
+
+class_alias('SimplePie\File', 'SimplePie_File');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcHTTPParserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/HTTP/Parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/HTTP/Parser.php   2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/HTTP/Parser.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\HTTP;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * HTTP Response Parser
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,473 +50,459 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage HTTP
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_HTTP_Parser
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Parser
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * HTTP Version
-        *
-        * @var float
-        */
-       public $http_version = 0.0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * HTTP Version
+     *
+     * @var float
+     */
+    public $http_version = 0.0;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Status code
-        *
-        * @var int
-        */
-       public $status_code = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Status code
+     *
+     * @var int
+     */
+    public $status_code = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Reason phrase
-        *
-        * @var string
-        */
-       public $reason = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Reason phrase
+     *
+     * @var string
+     */
+    public $reason = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Key/value pairs of the headers
-        *
-        * @var array
-        */
-       public $headers = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Key/value pairs of the headers
+     *
+     * @var array
+     */
+    public $headers = [];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Body of the response
-        *
-        * @var string
-        */
-       public $body = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Body of the response
+     *
+     * @var string
+     */
+    public $body = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Current state of the state machine
-        *
-        * @var string
-        */
-       protected $state = 'http_version';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_HTTP_VERSION = 'http_version';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Input data
-        *
-        * @var string
-        */
-       protected $data = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_STATUS = 'status';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Input data length (to avoid calling strlen() everytime this is needed)
-        *
-        * @var int
-        */
-       protected $data_length = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_REASON = 'reason';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Current position of the pointer
-        *
-        * @var int
-        */
-       protected $position = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_NEW_LINE = 'new_line';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Name of the hedaer currently being parsed
-        *
-        * @var string
-        */
-       protected $name = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_BODY = 'body';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Value of the hedaer currently being parsed
-        *
-        * @var string
-        */
-       protected $value = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_NAME = 'name';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create an instance of the class with the input data
-        *
-        * @param string $data Input data
-        */
-       public function __construct($data)
-       {
-               $this->data = $data;
-               $this->data_length = strlen($this->data);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_VALUE = 'value';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse the input data
-        *
-        * @return bool true on success, false on failure
-        */
-       public function parse()
-       {
-               while ($this->state && $this->state !== 'emit' && $this->has_data())
-               {
-                       $state = $this->state;
-                       $this->$state();
-               }
-               $this->data = '';
-               if ($this->state === 'emit' || $this->state === 'body')
-               {
-                       return true;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_VALUE_CHAR = 'value_char';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->http_version = '';
-               $this->status_code = '';
-               $this->reason = '';
-               $this->headers = array();
-               $this->body = '';
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_QUOTE = 'quote';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Check whether there is data beyond the pointer
-        *
-        * @return bool true if there is further data, false if not
-        */
-       protected function has_data()
-       {
-               return (bool) ($this->position < $this->data_length);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_QUOTE_ESCAPED = 'quote_escaped';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * See if the next character is LWS
-        *
-        * @return bool true if the next character is LWS, false if not
-        */
-       protected function is_linear_whitespace()
-       {
-               return (bool) ($this->data[$this->position] === "\x09"
-                       || $this->data[$this->position] === "\x20"
-                       || ($this->data[$this->position] === "\x0A"
-                               && isset($this->data[$this->position + 1])
-                               && ($this->data[$this->position + 1] === "\x09" || $this->data[$this->position + 1] === "\x20")));
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_QUOTE_CHAR = 'quote_char';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse the HTTP version
-        */
-       protected function http_version()
-       {
-               if (strpos($this->data, "\x0A") !== false && strtoupper(substr($this->data, 0, 5)) === 'HTTP/')
-               {
-                       $len = strspn($this->data, '0123456789.', 5);
-                       $this->http_version = substr($this->data, 5, $len);
-                       $this->position += 5 + $len;
-                       if (substr_count($this->http_version, '.') <= 1)
-                       {
-                               $this->http_version = (float) $this->http_version;
-                               $this->position += strspn($this->data, "\x09\x20", $this->position);
-                               $this->state = 'status';
-                       }
-                       else
-                       {
-                               $this->state = false;
-                       }
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_CHUNKED = 'chunked';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse the status code
-        */
-       protected function status()
-       {
-               if ($len = strspn($this->data, '0123456789', $this->position))
-               {
-                       $this->status_code = (int) substr($this->data, $this->position, $len);
-                       $this->position += $len;
-                       $this->state = 'reason';
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_EMIT = 'emit';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse the reason phrase
-        */
-       protected function reason()
-       {
-               $len = strcspn($this->data, "\x0A", $this->position);
-               $this->reason = trim(substr($this->data, $this->position, $len), "\x09\x0D\x20");
-               $this->position += $len + 1;
-               $this->state = 'new_line';
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_ERROR = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Deal with a new line, shifting data around as needed
-        */
-       protected function new_line()
-       {
-               $this->value = trim($this->value, "\x0D\x20");
-               if ($this->name !== '' && $this->value !== '')
-               {
-                       $this->name = strtolower($this->name);
-                       // We should only use the last Content-Type header. c.f. issue #1
-                       if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
-                       {
-                               $this->headers[$this->name] .= ', ' . $this->value;
-                       }
-                       else
-                       {
-                               $this->headers[$this->name] = $this->value;
-                       }
-               }
-               $this->name = '';
-               $this->value = '';
-               if (substr($this->data[$this->position], 0, 2) === "\x0D\x0A")
-               {
-                       $this->position += 2;
-                       $this->state = 'body';
-               }
-               elseif ($this->data[$this->position] === "\x0A")
-               {
-                       $this->position++;
-                       $this->state = 'body';
-               }
-               else
-               {
-                       $this->state = 'name';
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Current state of the state machine
+     *
+     * @var self::STATE_*
+     */
+    protected $state = self::STATE_HTTP_VERSION;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse a header name
-        */
-       protected function name()
-       {
-               $len = strcspn($this->data, "\x0A:", $this->position);
-               if (isset($this->data[$this->position + $len]))
-               {
-                       if ($this->data[$this->position + $len] === "\x0A")
-                       {
-                               $this->position += $len;
-                               $this->state = 'new_line';
-                       }
-                       else
-                       {
-                               $this->name = substr($this->data, $this->position, $len);
-                               $this->position += $len + 1;
-                               $this->state = 'value';
-                       }
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Input data
+     *
+     * @var string
+     */
+    protected $data = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse LWS, replacing consecutive LWS characters with a single space
-        */
-       protected function linear_whitespace()
-       {
-               do
-               {
-                       if (substr($this->data, $this->position, 2) === "\x0D\x0A")
-                       {
-                               $this->position += 2;
-                       }
-                       elseif ($this->data[$this->position] === "\x0A")
-                       {
-                               $this->position++;
-                       }
-                       $this->position += strspn($this->data, "\x09\x20", $this->position);
-               } while ($this->has_data() && $this->is_linear_whitespace());
-               $this->value .= "\x20";
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Input data length (to avoid calling strlen() everytime this is needed)
+     *
+     * @var int
+     */
+    protected $data_length = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * See what state to move to while within non-quoted header values
-        */
-       protected function value()
-       {
-               if ($this->is_linear_whitespace())
-               {
-                       $this->linear_whitespace();
-               }
-               else
-               {
-                       switch ($this->data[$this->position])
-                       {
-                               case '"':
-                                       // Workaround for ETags: we have to include the quotes as
-                                       // part of the tag.
-                                       if (strtolower($this->name) === 'etag')
-                                       {
-                                               $this->value .= '"';
-                                               $this->position++;
-                                               $this->state = 'value_char';
-                                               break;
-                                       }
-                                       $this->position++;
-                                       $this->state = 'quote';
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Current position of the pointer
+     *
+     * @var int
+     */
+    protected $position = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case "\x0A":
-                                       $this->position++;
-                                       $this->state = 'new_line';
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Name of the hedaer currently being parsed
+     *
+     * @var string
+     */
+    protected $name = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                default:
-                                       $this->state = 'value_char';
-                                       break;
-                       }
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Value of the hedaer currently being parsed
+     *
+     * @var string
+     */
+    protected $value = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse a header value while outside quotes
-        */
-       protected function value_char()
-       {
-               $len = strcspn($this->data, "\x09\x20\x0A\"", $this->position);
-               $this->value .= substr($this->data, $this->position, $len);
-               $this->position += $len;
-               $this->state = 'value';
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Create an instance of the class with the input data
+     *
+     * @param string $data Input data
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+        $this->data_length = strlen($this->data);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * See what state to move to while within quoted header values
-        */
-       protected function quote()
-       {
-               if ($this->is_linear_whitespace())
-               {
-                       $this->linear_whitespace();
-               }
-               else
-               {
-                       switch ($this->data[$this->position])
-                       {
-                               case '"':
-                                       $this->position++;
-                                       $this->state = 'value';
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse the input data
+     *
+     * @return bool true on success, false on failure
+     */
+    public function parse()
+    {
+        while ($this->state && $this->state !== self::STATE_EMIT && $this->has_data()) {
+            $state = $this->state;
+            $this->$state();
+        }
+        $this->data = '';
+        if ($this->state === self::STATE_EMIT || $this->state === self::STATE_BODY) {
+            return true;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case "\x0A":
-                                       $this->position++;
-                                       $this->state = 'new_line';
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $this->http_version = '';
+        $this->status_code = 0;
+        $this->reason = '';
+        $this->headers = [];
+        $this->body = '';
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '\\':
-                                       $this->position++;
-                                       $this->state = 'quote_escaped';
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Check whether there is data beyond the pointer
+     *
+     * @return bool true if there is further data, false if not
+     */
+    protected function has_data()
+    {
+        return (bool) ($this->position < $this->data_length);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                default:
-                                       $this->state = 'quote_char';
-                                       break;
-                       }
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * See if the next character is LWS
+     *
+     * @return bool true if the next character is LWS, false if not
+     */
+    protected function is_linear_whitespace()
+    {
+        return (bool) ($this->data[$this->position] === "\x09"
+            || $this->data[$this->position] === "\x20"
+            || ($this->data[$this->position] === "\x0A"
+                && isset($this->data[$this->position + 1])
+                && ($this->data[$this->position + 1] === "\x09" || $this->data[$this->position + 1] === "\x20")));
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse a header value while within quotes
-        */
-       protected function quote_char()
-       {
-               $len = strcspn($this->data, "\x09\x20\x0A\"\\", $this->position);
-               $this->value .= substr($this->data, $this->position, $len);
-               $this->position += $len;
-               $this->state = 'value';
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse the HTTP version
+     */
+    protected function http_version()
+    {
+        if (strpos($this->data, "\x0A") !== false && strtoupper(substr($this->data, 0, 5)) === 'HTTP/') {
+            $len = strspn($this->data, '0123456789.', 5);
+            $this->http_version = substr($this->data, 5, $len);
+            $this->position += 5 + $len;
+            if (substr_count($this->http_version, '.') <= 1) {
+                $this->http_version = (float) $this->http_version;
+                $this->position += strspn($this->data, "\x09\x20", $this->position);
+                $this->state = self::STATE_STATUS;
+            } else {
+                $this->state = self::STATE_ERROR;
+            }
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse an escaped character within quotes
-        */
-       protected function quote_escaped()
-       {
-               $this->value .= $this->data[$this->position];
-               $this->position++;
-               $this->state = 'quote';
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse the status code
+     */
+    protected function status()
+    {
+        if ($len = strspn($this->data, '0123456789', $this->position)) {
+            $this->status_code = (int) substr($this->data, $this->position, $len);
+            $this->position += $len;
+            $this->state = self::STATE_REASON;
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse the body
-        */
-       protected function body()
-       {
-               $this->body = substr($this->data, $this->position);
-               if (!empty($this->headers['transfer-encoding']))
-               {
-                       unset($this->headers['transfer-encoding']);
-                       $this->state = 'chunked';
-               }
-               else
-               {
-                       $this->state = 'emit';
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse the reason phrase
+     */
+    protected function reason()
+    {
+        $len = strcspn($this->data, "\x0A", $this->position);
+        $this->reason = trim(substr($this->data, $this->position, $len), "\x09\x0D\x20");
+        $this->position += $len + 1;
+        $this->state = self::STATE_NEW_LINE;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parsed a "Transfer-Encoding: chunked" body
-        */
-       protected function chunked()
-       {
-               if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($this->body)))
-               {
-                       $this->state = 'emit';
-                       return;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Deal with a new line, shifting data around as needed
+     */
+    protected function new_line()
+    {
+        $this->value = trim($this->value, "\x0D\x20");
+        if ($this->name !== '' && $this->value !== '') {
+            $this->name = strtolower($this->name);
+            // We should only use the last Content-Type header. c.f. issue #1
+            if (isset($this->headers[$this->name]) && $this->name !== 'content-type') {
+                $this->headers[$this->name] .= ', ' . $this->value;
+            } else {
+                $this->headers[$this->name] = $this->value;
+            }
+        }
+        $this->name = '';
+        $this->value = '';
+        if (substr($this->data[$this->position], 0, 2) === "\x0D\x0A") {
+            $this->position += 2;
+            $this->state = self::STATE_BODY;
+        } elseif ($this->data[$this->position] === "\x0A") {
+            $this->position++;
+            $this->state = self::STATE_BODY;
+        } else {
+            $this->state = self::STATE_NAME;
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $decoded = '';
-               $encoded = $this->body;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse a header name
+     */
+    protected function name()
+    {
+        $len = strcspn($this->data, "\x0A:", $this->position);
+        if (isset($this->data[$this->position + $len])) {
+            if ($this->data[$this->position + $len] === "\x0A") {
+                $this->position += $len;
+                $this->state = self::STATE_NEW_LINE;
+            } else {
+                $this->name = substr($this->data, $this->position, $len);
+                $this->position += $len + 1;
+                $this->state = self::STATE_VALUE;
+            }
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                while (true)
-               {
-                       $is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
-                       if (!$is_chunked)
-                       {
-                               // Looks like it's not chunked after all
-                               $this->state = 'emit';
-                               return;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse LWS, replacing consecutive LWS characters with a single space
+     */
+    protected function linear_whitespace()
+    {
+        do {
+            if (substr($this->data, $this->position, 2) === "\x0D\x0A") {
+                $this->position += 2;
+            } elseif ($this->data[$this->position] === "\x0A") {
+                $this->position++;
+            }
+            $this->position += strspn($this->data, "\x09\x20", $this->position);
+        } while ($this->has_data() && $this->is_linear_whitespace());
+        $this->value .= "\x20";
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $length = hexdec(trim($matches[1]));
-                       if ($length === 0)
-                       {
-                               // Ignore trailer headers
-                               $this->state = 'emit';
-                               $this->body = $decoded;
-                               return;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * See what state to move to while within non-quoted header values
+     */
+    protected function value()
+    {
+        if ($this->is_linear_whitespace()) {
+            $this->linear_whitespace();
+        } else {
+            switch ($this->data[$this->position]) {
+                case '"':
+                    // Workaround for ETags: we have to include the quotes as
+                    // part of the tag.
+                    if (strtolower($this->name) === 'etag') {
+                        $this->value .= '"';
+                        $this->position++;
+                        $this->state = self::STATE_VALUE_CHAR;
+                        break;
+                    }
+                    $this->position++;
+                    $this->state = self::STATE_QUOTE;
+                    break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $chunk_length = strlen($matches[0]);
-                       $decoded .= $part = substr($encoded, $chunk_length, $length);
-                       $encoded = substr($encoded, $chunk_length + $length + 2);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                case "\x0A":
+                    $this->position++;
+                    $this->state = self::STATE_NEW_LINE;
+                    break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if (trim($encoded) === '0' || empty($encoded))
-                       {
-                               $this->state = 'emit';
-                               $this->body = $decoded;
-                               return;
-                       }
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                default:
+                    $this->state = self::STATE_VALUE_CHAR;
+                    break;
+            }
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Prepare headers (take care of proxies headers)
-        *
-        * @param string  $headers Raw headers
-        * @param integer $count   Redirection count. Default to 1.
-        *
-        * @return string
-        */
-       static public function prepareHeaders($headers, $count = 1)
-       {
-               $data = explode("\r\n\r\n", $headers, $count);
-               $data = array_pop($data);
-               if (false !== stripos($data, "HTTP/1.0 200 Connection established\r\n")) {
-                       $exploded = explode("\r\n\r\n", $data, 2);
-                       $data = end($exploded);
-               }
-               if (false !== stripos($data, "HTTP/1.1 200 Connection established\r\n")) {
-                       $exploded = explode("\r\n\r\n", $data, 2);
-                       $data = end($exploded);
-               }
-               return $data;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse a header value while outside quotes
+     */
+    protected function value_char()
+    {
+        $len = strcspn($this->data, "\x09\x20\x0A\"", $this->position);
+        $this->value .= substr($this->data, $this->position, $len);
+        $this->position += $len;
+        $this->state = self::STATE_VALUE;
+    }
+
+    /**
+     * See what state to move to while within quoted header values
+     */
+    protected function quote()
+    {
+        if ($this->is_linear_whitespace()) {
+            $this->linear_whitespace();
+        } else {
+            switch ($this->data[$this->position]) {
+                case '"':
+                    $this->position++;
+                    $this->state = self::STATE_VALUE;
+                    break;
+
+                case "\x0A":
+                    $this->position++;
+                    $this->state = self::STATE_NEW_LINE;
+                    break;
+
+                case '\\':
+                    $this->position++;
+                    $this->state = self::STATE_QUOTE_ESCAPED;
+                    break;
+
+                default:
+                    $this->state = self::STATE_QUOTE_CHAR;
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Parse a header value while within quotes
+     */
+    protected function quote_char()
+    {
+        $len = strcspn($this->data, "\x09\x20\x0A\"\\", $this->position);
+        $this->value .= substr($this->data, $this->position, $len);
+        $this->position += $len;
+        $this->state = self::STATE_VALUE;
+    }
+
+    /**
+     * Parse an escaped character within quotes
+     */
+    protected function quote_escaped()
+    {
+        $this->value .= $this->data[$this->position];
+        $this->position++;
+        $this->state = self::STATE_QUOTE;
+    }
+
+    /**
+     * Parse the body
+     */
+    protected function body()
+    {
+        $this->body = substr($this->data, $this->position);
+        if (!empty($this->headers['transfer-encoding'])) {
+            unset($this->headers['transfer-encoding']);
+            $this->state = self::STATE_CHUNKED;
+        } else {
+            $this->state = self::STATE_EMIT;
+        }
+    }
+
+    /**
+     * Parsed a "Transfer-Encoding: chunked" body
+     */
+    protected function chunked()
+    {
+        if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($this->body))) {
+            $this->state = self::STATE_EMIT;
+            return;
+        }
+
+        $decoded = '';
+        $encoded = $this->body;
+
+        while (true) {
+            $is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
+            if (!$is_chunked) {
+                // Looks like it's not chunked after all
+                $this->state = self::STATE_EMIT;
+                return;
+            }
+
+            $length = hexdec(trim($matches[1]));
+            if ($length === 0) {
+                // Ignore trailer headers
+                $this->state = self::STATE_EMIT;
+                $this->body = $decoded;
+                return;
+            }
+
+            $chunk_length = strlen($matches[0]);
+            $decoded .= substr($encoded, $chunk_length, $length);
+            $encoded = substr($encoded, $chunk_length + $length + 2);
+
+            // BC for PHP < 8.0: substr() can return bool instead of string
+            $encoded = ($encoded === false) ? '' : $encoded;
+
+            if (trim($encoded) === '0' || empty($encoded)) {
+                $this->state = self::STATE_EMIT;
+                $this->body = $decoded;
+                return;
+            }
+        }
+    }
+
+    /**
+     * Prepare headers (take care of proxies headers)
+     *
+     * @param string  $headers Raw headers
+     * @param integer $count   Redirection count. Default to 1.
+     *
+     * @return string
+     */
+    public static function prepareHeaders($headers, $count = 1)
+    {
+        $data = explode("\r\n\r\n", $headers, $count);
+        $data = array_pop($data);
+        if (false !== stripos($data, "HTTP/1.0 200 Connection established\r\n")) {
+            $exploded = explode("\r\n\r\n", $data, 2);
+            $data = end($exploded);
+        }
+        if (false !== stripos($data, "HTTP/1.1 200 Connection established\r\n")) {
+            $exploded = explode("\r\n\r\n", $data, 2);
+            $data = end($exploded);
+        }
+        return $data;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\HTTP\Parser', 'SimplePie_HTTP_Parser');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcIRIphpfromrev59140trunksrcwpincludesSimplePieIRIphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/IRI.php (from rev 59140, trunk/src/wp-includes/SimplePie/IRI.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/IRI.php                               (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/IRI.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,1108 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * IRI parser/serialiser/normaliser
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @author Sam Sneddon
+ * @author Steve Minutillo
+ * @author Ryan McCue
+ * @copyright 2007-2012 Sam Sneddon, Steve Minutillo, Ryan McCue
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ */
+class IRI
+{
+    /**
+     * Scheme
+     *
+     * @var string
+     */
+    protected $scheme = null;
+
+    /**
+     * User Information
+     *
+     * @var string
+     */
+    protected $iuserinfo = null;
+
+    /**
+     * ihost
+     *
+     * @var string
+     */
+    protected $ihost = null;
+
+    /**
+     * Port
+     *
+     * @var string
+     */
+    protected $port = null;
+
+    /**
+     * ipath
+     *
+     * @var string
+     */
+    protected $ipath = '';
+
+    /**
+     * iquery
+     *
+     * @var string
+     */
+    protected $iquery = null;
+
+    /**
+     * ifragment
+     *
+     * @var string
+     */
+    protected $ifragment = null;
+
+    /**
+     * Normalization database
+     *
+     * Each key is the scheme, each value is an array with each key as the IRI
+     * part and value as the default value for that part.
+     */
+    protected $normalization = [
+        'acap' => [
+            'port' => 674
+        ],
+        'dict' => [
+            'port' => 2628
+        ],
+        'file' => [
+            'ihost' => 'localhost'
+        ],
+        'http' => [
+            'port' => 80,
+            'ipath' => '/'
+        ],
+        'https' => [
+            'port' => 443,
+            'ipath' => '/'
+        ],
+    ];
+
+    /**
+     * Return the entire IRI when you try and read the object as a string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->get_iri();
+    }
+
+    /**
+     * Overload __set() to provide access via properties
+     *
+     * @param string $name Property name
+     * @param mixed $value Property value
+     */
+    public function __set($name, $value)
+    {
+        if (method_exists($this, 'set_' . $name)) {
+            call_user_func([$this, 'set_' . $name], $value);
+        } elseif (
+            $name === 'iauthority'
+            || $name === 'iuserinfo'
+            || $name === 'ihost'
+            || $name === 'ipath'
+            || $name === 'iquery'
+            || $name === 'ifragment'
+        ) {
+            call_user_func([$this, 'set_' . substr($name, 1)], $value);
+        }
+    }
+
+    /**
+     * Overload __get() to provide access via properties
+     *
+     * @param string $name Property name
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        // isset() returns false for null, we don't want to do that
+        // Also why we use array_key_exists below instead of isset()
+        $props = get_object_vars($this);
+
+        if (
+            $name === 'iri' ||
+            $name === 'uri' ||
+            $name === 'iauthority' ||
+            $name === 'authority'
+        ) {
+            $return = $this->{"get_$name"}();
+        } elseif (array_key_exists($name, $props)) {
+            $return = $this->$name;
+        }
+        // host -> ihost
+        elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) {
+            $name = $prop;
+            $return = $this->$prop;
+        }
+        // ischeme -> scheme
+        elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
+            $name = $prop;
+            $return = $this->$prop;
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+            $return = null;
+        }
+
+        if ($return === null && isset($this->normalization[$this->scheme][$name])) {
+            return $this->normalization[$this->scheme][$name];
+        }
+
+        return $return;
+    }
+
+    /**
+     * Overload __isset() to provide access via properties
+     *
+     * @param string $name Property name
+     * @return bool
+     */
+    public function __isset($name)
+    {
+        return method_exists($this, 'get_' . $name) || isset($this->$name);
+    }
+
+    /**
+     * Overload __unset() to provide access via properties
+     *
+     * @param string $name Property name
+     */
+    public function __unset($name)
+    {
+        if (method_exists($this, 'set_' . $name)) {
+            call_user_func([$this, 'set_' . $name], '');
+        }
+    }
+
+    /**
+     * Create a new IRI object, from a specified string
+     *
+     * @param string $iri
+     */
+    public function __construct($iri = null)
+    {
+        $this->set_iri($iri);
+    }
+
+    /**
+     * Clean up
+     */
+    public function __destruct()
+    {
+        $this->set_iri(null, true);
+        $this->set_path(null, true);
+        $this->set_authority(null, true);
+    }
+
+    /**
+     * Create a new IRI object by resolving a relative IRI
+     *
+     * Returns false if $base is not absolute, otherwise an IRI.
+     *
+     * @param IRI|string $base (Absolute) Base IRI
+     * @param IRI|string $relative Relative IRI
+     * @return IRI|false
+     */
+    public static function absolutize($base, $relative)
+    {
+        if (!($relative instanceof IRI)) {
+            $relative = new IRI($relative);
+        }
+        if (!$relative->is_valid()) {
+            return false;
+        } elseif ($relative->scheme !== null) {
+            return clone $relative;
+        } else {
+            if (!($base instanceof IRI)) {
+                $base = new IRI($base);
+            }
+            if ($base->scheme !== null && $base->is_valid()) {
+                if ($relative->get_iri() !== '') {
+                    if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
+                        $target = clone $relative;
+                        $target->scheme = $base->scheme;
+                    } else {
+                        $target = new IRI();
+                        $target->scheme = $base->scheme;
+                        $target->iuserinfo = $base->iuserinfo;
+                        $target->ihost = $base->ihost;
+                        $target->port = $base->port;
+                        if ($relative->ipath !== '') {
+                            if ($relative->ipath[0] === '/') {
+                                $target->ipath = $relative->ipath;
+                            } elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
+                                $target->ipath = '/' . $relative->ipath;
+                            } elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
+                                $target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+                            } else {
+                                $target->ipath = $relative->ipath;
+                            }
+                            $target->ipath = $target->remove_dot_segments($target->ipath);
+                            $target->iquery = $relative->iquery;
+                        } else {
+                            $target->ipath = $base->ipath;
+                            if ($relative->iquery !== null) {
+                                $target->iquery = $relative->iquery;
+                            } elseif ($base->iquery !== null) {
+                                $target->iquery = $base->iquery;
+                            }
+                        }
+                        $target->ifragment = $relative->ifragment;
+                    }
+                } else {
+                    $target = clone $base;
+                    $target->ifragment = null;
+                }
+                $target->scheme_normalization();
+                return $target;
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Parse an IRI into scheme/authority/path/query/fragment segments
+     *
+     * @param string $iri
+     * @return array
+     */
+    protected function parse_iri($iri)
+    {
+        $iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
+        if (preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match)) {
+            if ($match[1] === '') {
+                $match['scheme'] = null;
+            }
+            if (!isset($match[3]) || $match[3] === '') {
+                $match['authority'] = null;
+            }
+            if (!isset($match[5])) {
+                $match['path'] = '';
+            }
+            if (!isset($match[6]) || $match[6] === '') {
+                $match['query'] = null;
+            }
+            if (!isset($match[8]) || $match[8] === '') {
+                $match['fragment'] = null;
+            }
+            return $match;
+        }
+
+        // This can occur when a paragraph is accidentally parsed as a URI
+        return false;
+    }
+
+    /**
+     * Remove dot segments from a path
+     *
+     * @param string $input
+     * @return string
+     */
+    protected function remove_dot_segments($input)
+    {
+        $output = '';
+        while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') {
+            // A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise,
+            if (strpos($input, '../') === 0) {
+                $input = substr($input, 3);
+            } elseif (strpos($input, './') === 0) {
+                $input = substr($input, 2);
+            }
+            // B: if the input buffer begins with a prefix of "/./" or "/.", where "." is a complete path segment, then replace that prefix with "/" in the input buffer; otherwise,
+            elseif (strpos($input, '/./') === 0) {
+                $input = substr($input, 2);
+            } elseif ($input === '/.') {
+                $input = '/';
+            }
+            // C: if the input buffer begins with a prefix of "/../" or "/..", where ".." is a complete path segment, then replace that prefix with "/" in the input buffer and remove the last segment and its preceding "/" (if any) from the output buffer; otherwise,
+            elseif (strpos($input, '/../') === 0) {
+                $input = substr($input, 3);
+                $output = substr_replace($output, '', intval(strrpos($output, '/')));
+            } elseif ($input === '/..') {
+                $input = '/';
+                $output = substr_replace($output, '', intval(strrpos($output, '/')));
+            }
+            // D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise,
+            elseif ($input === '.' || $input === '..') {
+                $input = '';
+            }
+            // E: move the first path segment in the input buffer to the end of the output buffer, including the initial "/" character (if any) and any subsequent characters up to, but not including, the next "/" character or the end of the input buffer
+            elseif (($pos = strpos($input, '/', 1)) !== false) {
+                $output .= substr($input, 0, $pos);
+                $input = substr_replace($input, '', 0, $pos);
+            } else {
+                $output .= $input;
+                $input = '';
+            }
+        }
+        return $output . $input;
+    }
+
+    /**
+     * Replace invalid character with percent encoding
+     *
+     * @param string $string Input string
+     * @param string $extra_chars Valid characters not in iunreserved or
+     *                            iprivate (this is ASCII-only)
+     * @param bool $iprivate Allow iprivate
+     * @return string
+     */
+    protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
+    {
+        // Normalize as many pct-encoded sections as possible
+        $string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', [$this, 'remove_iunreserved_percent_encoded'], $string);
+
+        // Replace invalid percent characters
+        $string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
+
+        // Add unreserved and % to $extra_chars (the latter is safe because all
+        // pct-encoded sections are now valid).
+        $extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
+
+        // Now replace any bytes that aren't allowed with their pct-encoded versions
+        $position = 0;
+        $strlen = strlen($string);
+        while (($position += strspn($string, $extra_chars, $position)) < $strlen) {
+            $value = ord($string[$position]);
+            $character = 0;
+
+            // Start position
+            $start = $position;
+
+            // By default we are valid
+            $valid = true;
+
+            // No one byte sequences are valid due to the while.
+            // Two byte sequence:
+            if (($value & 0xE0) === 0xC0) {
+                $character = ($value & 0x1F) << 6;
+                $length = 2;
+                $remaining = 1;
+            }
+            // Three byte sequence:
+            elseif (($value & 0xF0) === 0xE0) {
+                $character = ($value & 0x0F) << 12;
+                $length = 3;
+                $remaining = 2;
+            }
+            // Four byte sequence:
+            elseif (($value & 0xF8) === 0xF0) {
+                $character = ($value & 0x07) << 18;
+                $length = 4;
+                $remaining = 3;
+            }
+            // Invalid byte:
+            else {
+                $valid = false;
+                $length = 1;
+                $remaining = 0;
+            }
+
+            if ($remaining) {
+                if ($position + $length <= $strlen) {
+                    for ($position++; $remaining; $position++) {
+                        $value = ord($string[$position]);
+
+                        // Check that the byte is valid, then add it to the character:
+                        if (($value & 0xC0) === 0x80) {
+                            $character |= ($value & 0x3F) << (--$remaining * 6);
+                        }
+                        // If it is invalid, count the sequence as invalid and reprocess the current byte:
+                        else {
+                            $valid = false;
+                            $position--;
+                            break;
+                        }
+                    }
+                } else {
+                    $position = $strlen - 1;
+                    $valid = false;
+                }
+            }
+
+            // Percent encode anything invalid or not in ucschar
+            if (
+                // Invalid sequences
+                !$valid
+                // Non-shortest form sequences are invalid
+                || $length > 1 && $character <= 0x7F
+                || $length > 2 && $character <= 0x7FF
+                || $length > 3 && $character <= 0xFFFF
+                // Outside of range of ucschar codepoints
+                // Noncharacters
+                || ($character & 0xFFFE) === 0xFFFE
+                || $character >= 0xFDD0 && $character <= 0xFDEF
+                || (
+                    // Everything else not in ucschar
+                    $character > 0xD7FF && $character < 0xF900
+                    || $character < 0xA0
+                    || $character > 0xEFFFD
+                )
+                && (
+                    // Everything not in iprivate, if it applies
+                    !$iprivate
+                    || $character < 0xE000
+                    || $character > 0x10FFFD
+                )
+            ) {
+                // If we were a character, pretend we weren't, but rather an error.
+                if ($valid) {
+                    $position--;
+                }
+
+                for ($j = $start; $j <= $position; $j++) {
+                    $string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
+                    $j += 2;
+                    $position += 2;
+                    $strlen += 2;
+                }
+            }
+        }
+
+        return $string;
+    }
+
+    /**
+     * Callback function for preg_replace_callback.
+     *
+     * Removes sequences of percent encoded bytes that represent UTF-8
+     * encoded characters in iunreserved
+     *
+     * @param array $match PCRE match
+     * @return string Replacement
+     */
+    protected function remove_iunreserved_percent_encoded($match)
+    {
+        // As we just have valid percent encoded sequences we can just explode
+        // and ignore the first member of the returned array (an empty string).
+        $bytes = explode('%', $match[0]);
+
+        // Initialize the new string (this is what will be returned) and that
+        // there are no bytes remaining in the current sequence (unsurprising
+        // at the first byte!).
+        $string = '';
+        $remaining = 0;
+
+        // these variables will be initialized in the loop but PHPStan is not able to detect it currently
+        $start = 0;
+        $character = 0;
+        $length = 0;
+        $valid = true;
+
+        // Loop over each and every byte, and set $value to its value
+        for ($i = 1, $len = count($bytes); $i < $len; $i++) {
+            $value = hexdec($bytes[$i]);
+
+            // If we're the first byte of sequence:
+            if (!$remaining) {
+                // Start position
+                $start = $i;
+
+                // By default we are valid
+                $valid = true;
+
+                // One byte sequence:
+                if ($value <= 0x7F) {
+                    $character = $value;
+                    $length = 1;
+                }
+                // Two byte sequence:
+                elseif (($value & 0xE0) === 0xC0) {
+                    $character = ($value & 0x1F) << 6;
+                    $length = 2;
+                    $remaining = 1;
+                }
+                // Three byte sequence:
+                elseif (($value & 0xF0) === 0xE0) {
+                    $character = ($value & 0x0F) << 12;
+                    $length = 3;
+                    $remaining = 2;
+                }
+                // Four byte sequence:
+                elseif (($value & 0xF8) === 0xF0) {
+                    $character = ($value & 0x07) << 18;
+                    $length = 4;
+                    $remaining = 3;
+                }
+                // Invalid byte:
+                else {
+                    $valid = false;
+                    $remaining = 0;
+                }
+            }
+            // Continuation byte:
+            else {
+                // Check that the byte is valid, then add it to the character:
+                if (($value & 0xC0) === 0x80) {
+                    $remaining--;
+                    $character |= ($value & 0x3F) << ($remaining * 6);
+                }
+                // If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
+                else {
+                    $valid = false;
+                    $remaining = 0;
+                    $i--;
+                }
+            }
+
+            // If we've reached the end of the current byte sequence, append it to Unicode::$data
+            if (!$remaining) {
+                // Percent encode anything invalid or not in iunreserved
+                if (
+                    // Invalid sequences
+                    !$valid
+                    // Non-shortest form sequences are invalid
+                    || $length > 1 && $character <= 0x7F
+                    || $length > 2 && $character <= 0x7FF
+                    || $length > 3 && $character <= 0xFFFF
+                    // Outside of range of iunreserved codepoints
+                    || $character < 0x2D
+                    || $character > 0xEFFFD
+                    // Noncharacters
+                    || ($character & 0xFFFE) === 0xFFFE
+                    || $character >= 0xFDD0 && $character <= 0xFDEF
+                    // Everything else not in iunreserved (this is all BMP)
+                    || $character === 0x2F
+                    || $character > 0x39 && $character < 0x41
+                    || $character > 0x5A && $character < 0x61
+                    || $character > 0x7A && $character < 0x7E
+                    || $character > 0x7E && $character < 0xA0
+                    || $character > 0xD7FF && $character < 0xF900
+                ) {
+                    for ($j = $start; $j <= $i; $j++) {
+                        $string .= '%' . strtoupper($bytes[$j]);
+                    }
+                } else {
+                    for ($j = $start; $j <= $i; $j++) {
+                        $string .= chr(hexdec($bytes[$j]));
+                    }
+                }
+            }
+        }
+
+        // If we have any bytes left over they are invalid (i.e., we are
+        // mid-way through a multi-byte sequence)
+        if ($remaining) {
+            for ($j = $start; $j < $len; $j++) {
+                $string .= '%' . strtoupper($bytes[$j]);
+            }
+        }
+
+        return $string;
+    }
+
+    protected function scheme_normalization()
+    {
+        if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
+            $this->iuserinfo = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
+            $this->ihost = null;
+        }
+        if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
+            $this->port = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
+            $this->ipath = '';
+        }
+        if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
+            $this->iquery = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
+            $this->ifragment = null;
+        }
+    }
+
+    /**
+     * Check if the object represents a valid IRI. This needs to be done on each
+     * call as some things change depending on another part of the IRI.
+     *
+     * @return bool
+     */
+    public function is_valid()
+    {
+        if ($this->ipath === '') {
+            return true;
+        }
+
+        $isauthority = $this->iuserinfo !== null || $this->ihost !== null ||
+            $this->port !== null;
+        if ($isauthority && $this->ipath[0] === '/') {
+            return true;
+        }
+
+        if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) {
+            return false;
+        }
+
+        // Relative urls cannot have a colon in the first path segment (and the
+        // slashes themselves are not included so skip the first character).
+        if (!$this->scheme && !$isauthority &&
+            strpos($this->ipath, ':') !== false &&
+            strpos($this->ipath, '/', 1) !== false &&
+            strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Set the entire IRI. Returns true on success, false on failure (if there
+     * are any invalid characters).
+     *
+     * @param string $iri
+     * @return bool
+     */
+    public function set_iri($iri, $clear_cache = false)
+    {
+        static $cache;
+        if ($clear_cache) {
+            $cache = null;
+            return;
+        }
+        if (!$cache) {
+            $cache = [];
+        }
+
+        if ($iri === null) {
+            return true;
+        } elseif (isset($cache[$iri])) {
+            [
+                $this->scheme,
+                $this->iuserinfo,
+                $this->ihost,
+                $this->port,
+                $this->ipath,
+                $this->iquery,
+                $this->ifragment,
+                $return
+            ] = $cache[$iri];
+
+            return $return;
+        }
+
+        $parsed = $this->parse_iri((string) $iri);
+        if (!$parsed) {
+            return false;
+        }
+
+        $return = $this->set_scheme($parsed['scheme'])
+            && $this->set_authority($parsed['authority'])
+            && $this->set_path($parsed['path'])
+            && $this->set_query($parsed['query'])
+            && $this->set_fragment($parsed['fragment']);
+
+        $cache[$iri] = [
+            $this->scheme,
+            $this->iuserinfo,
+            $this->ihost,
+            $this->port,
+            $this->ipath,
+            $this->iquery,
+            $this->ifragment,
+            $return
+        ];
+
+        return $return;
+    }
+
+    /**
+     * Set the scheme. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $scheme
+     * @return bool
+     */
+    public function set_scheme($scheme)
+    {
+        if ($scheme === null) {
+            $this->scheme = null;
+        } elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
+            $this->scheme = null;
+            return false;
+        } else {
+            $this->scheme = strtolower($scheme);
+        }
+        return true;
+    }
+
+    /**
+     * Set the authority. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $authority
+     * @return bool
+     */
+    public function set_authority($authority, $clear_cache = false)
+    {
+        static $cache;
+        if ($clear_cache) {
+            $cache = null;
+            return;
+        }
+        if (!$cache) {
+            $cache = [];
+        }
+
+        if ($authority === null) {
+            $this->iuserinfo = null;
+            $this->ihost = null;
+            $this->port = null;
+            return true;
+        } elseif (isset($cache[$authority])) {
+            [
+                $this->iuserinfo,
+                $this->ihost,
+                $this->port,
+                $return
+            ] = $cache[$authority];
+
+            return $return;
+        }
+
+        $remaining = $authority;
+        if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
+            $iuserinfo = substr($remaining, 0, $iuserinfo_end);
+            $remaining = substr($remaining, $iuserinfo_end + 1);
+        } else {
+            $iuserinfo = null;
+        }
+        if (($port_start = strpos($remaining, ':', intval(strpos($remaining, ']')))) !== false) {
+            if (($port = substr($remaining, $port_start + 1)) === false) {
+                $port = null;
+            }
+            $remaining = substr($remaining, 0, $port_start);
+        } else {
+            $port = null;
+        }
+
+        $return = $this->set_userinfo($iuserinfo) &&
+                  $this->set_host($remaining) &&
+                  $this->set_port($port);
+
+        $cache[$authority] = [
+            $this->iuserinfo,
+            $this->ihost,
+            $this->port,
+            $return
+        ];
+
+        return $return;
+    }
+
+    /**
+     * Set the iuserinfo.
+     *
+     * @param string $iuserinfo
+     * @return bool
+     */
+    public function set_userinfo($iuserinfo)
+    {
+        if ($iuserinfo === null) {
+            $this->iuserinfo = null;
+        } else {
+            $this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
+            $this->scheme_normalization();
+        }
+
+        return true;
+    }
+
+    /**
+     * Set the ihost. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $ihost
+     * @return bool
+     */
+    public function set_host($ihost)
+    {
+        if ($ihost === null) {
+            $this->ihost = null;
+            return true;
+        } elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
+            if (\SimplePie\Net\IPv6::check_ipv6(substr($ihost, 1, -1))) {
+                $this->ihost = '[' . \SimplePie\Net\IPv6::compress(substr($ihost, 1, -1)) . ']';
+            } else {
+                $this->ihost = null;
+                return false;
+            }
+        } else {
+            $ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
+
+            // Lowercase, but ignore pct-encoded sections (as they should
+            // remain uppercase). This must be done after the previous step
+            // as that can add unescaped characters.
+            $position = 0;
+            $strlen = strlen($ihost);
+            while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
+                if ($ihost[$position] === '%') {
+                    $position += 3;
+                } else {
+                    $ihost[$position] = strtolower($ihost[$position]);
+                    $position++;
+                }
+            }
+
+            $this->ihost = $ihost;
+        }
+
+        $this->scheme_normalization();
+
+        return true;
+    }
+
+    /**
+     * Set the port. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $port
+     * @return bool
+     */
+    public function set_port($port)
+    {
+        if ($port === null) {
+            $this->port = null;
+            return true;
+        } elseif (strspn($port, '0123456789') === strlen($port)) {
+            $this->port = (int) $port;
+            $this->scheme_normalization();
+            return true;
+        }
+
+        $this->port = null;
+        return false;
+    }
+
+    /**
+     * Set the ipath.
+     *
+     * @param string $ipath
+     * @return bool
+     */
+    public function set_path($ipath, $clear_cache = false)
+    {
+        static $cache;
+        if ($clear_cache) {
+            $cache = null;
+            return;
+        }
+        if (!$cache) {
+            $cache = [];
+        }
+
+        $ipath = (string) $ipath;
+
+        if (isset($cache[$ipath])) {
+            $this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
+        } else {
+            $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
+            $removed = $this->remove_dot_segments($valid);
+
+            $cache[$ipath] = [$valid, $removed];
+            $this->ipath =  ($this->scheme !== null) ? $removed : $valid;
+        }
+
+        $this->scheme_normalization();
+        return true;
+    }
+
+    /**
+     * Set the iquery.
+     *
+     * @param string $iquery
+     * @return bool
+     */
+    public function set_query($iquery)
+    {
+        if ($iquery === null) {
+            $this->iquery = null;
+        } else {
+            $this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
+            $this->scheme_normalization();
+        }
+        return true;
+    }
+
+    /**
+     * Set the ifragment.
+     *
+     * @param string $ifragment
+     * @return bool
+     */
+    public function set_fragment($ifragment)
+    {
+        if ($ifragment === null) {
+            $this->ifragment = null;
+        } else {
+            $this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
+            $this->scheme_normalization();
+        }
+        return true;
+    }
+
+    /**
+     * Convert an IRI to a URI (or parts thereof)
+     *
+     * @return string
+     */
+    public function to_uri($string)
+    {
+        static $non_ascii;
+        if (!$non_ascii) {
+            $non_ascii = implode('', range("\x80", "\xFF"));
+        }
+
+        $position = 0;
+        $strlen = strlen($string);
+        while (($position += strcspn($string, $non_ascii, $position)) < $strlen) {
+            $string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
+            $position += 3;
+            $strlen += 2;
+        }
+
+        return $string;
+    }
+
+    /**
+     * Get the complete IRI
+     *
+     * @return string
+     */
+    public function get_iri()
+    {
+        if (!$this->is_valid()) {
+            return false;
+        }
+
+        $iri = '';
+        if ($this->scheme !== null) {
+            $iri .= $this->scheme . ':';
+        }
+        if (($iauthority = $this->get_iauthority()) !== null) {
+            $iri .= '//' . $iauthority;
+        }
+        if ($this->ipath !== '') {
+            $iri .= $this->ipath;
+        } elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '') {
+            $iri .= $this->normalization[$this->scheme]['ipath'];
+        }
+        if ($this->iquery !== null) {
+            $iri .= '?' . $this->iquery;
+        }
+        if ($this->ifragment !== null) {
+            $iri .= '#' . $this->ifragment;
+        }
+
+        return $iri;
+    }
+
+    /**
+     * Get the complete URI
+     *
+     * @return string
+     */
+    public function get_uri()
+    {
+        return $this->to_uri($this->get_iri());
+    }
+
+    /**
+     * Get the complete iauthority
+     *
+     * @return string
+     */
+    protected function get_iauthority()
+    {
+        if ($this->iuserinfo !== null || $this->ihost !== null || $this->port !== null) {
+            $iauthority = '';
+            if ($this->iuserinfo !== null) {
+                $iauthority .= $this->iuserinfo . '@';
+            }
+            if ($this->ihost !== null) {
+                $iauthority .= $this->ihost;
+            }
+            if ($this->port !== null && $this->port !== 0) {
+                $iauthority .= ':' . $this->port;
+            }
+            return $iauthority;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the complete authority
+     *
+     * @return string
+     */
+    protected function get_authority()
+    {
+        $iauthority = $this->get_iauthority();
+        if (is_string($iauthority)) {
+            return $this->to_uri($iauthority);
+        }
+
+        return $iauthority;
+    }
+}
+
+class_alias('SimplePie\IRI', 'SimplePie_IRI');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcItemphpfromrev59140trunksrcwpincludesSimplePieItemphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Item.php (from rev 59140, trunk/src/wp-includes/SimplePie/Item.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Item.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Item.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,2359 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Manages all item-related data
+ *
+ * Used by {@see \SimplePie\SimplePie::get_item()} and {@see \SimplePie\SimplePie::get_items()}
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_item_class()}
+ *
+ * @package \SimplePie\SimplePie
+ * @subpackage API
+ */
+class Item implements RegistryAware
+{
+    /**
+     * Parent feed
+     *
+     * @access private
+     * @var \SimplePie\SimplePie
+     */
+    public $feed;
+
+    /**
+     * Raw data
+     *
+     * @access private
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * Registry object
+     *
+     * @see set_registry
+     * @var \SimplePie\Registry
+     */
+    protected $registry;
+
+    /**
+     * Create a new item object
+     *
+     * This is usually used by {@see \SimplePie\SimplePie::get_items} and
+     * {@see \SimplePie\SimplePie::get_item}. Avoid creating this manually.
+     *
+     * @param \SimplePie\SimplePie $feed Parent feed
+     * @param array $data Raw data
+     */
+    public function __construct($feed, $data)
+    {
+        $this->feed = $feed;
+        $this->data = $data;
+    }
+
+    /**
+     * Set the registry handler
+     *
+     * This is usually used by {@see \SimplePie\Registry::create}
+     *
+     * @since 1.3
+     * @param \SimplePie\Registry $registry
+     */
+    public function set_registry(\SimplePie\Registry $registry)/* : void */
+    {
+        $this->registry = $registry;
+    }
+
+    /**
+     * Get a string representation of the item
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return md5(serialize($this->data));
+    }
+
+    /**
+     * Remove items that link back to this before destroying this object
+     */
+    public function __destruct()
+    {
+        if (!gc_enabled()) {
+            unset($this->feed);
+        }
+    }
+
+    /**
+     * Get data for an item-level element
+     *
+     * This method allows you to get access to ANY element/attribute that is a
+     * sub-element of the item/entry tag.
+     *
+     * See {@see \SimplePie\SimplePie::get_feed_tags()} for a description of the return value
+     *
+     * @since 1.0
+     * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+     * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+     * @param string $tag Tag name
+     * @return array
+     */
+    public function get_item_tags($namespace, $tag)
+    {
+        if (isset($this->data['child'][$namespace][$tag])) {
+            return $this->data['child'][$namespace][$tag];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the base URL value.
+     * Uses `<xml:base>`, or item link, or feed base URL.
+     *
+     * @param array $element
+     * @return string
+     */
+    public function get_base($element = [])
+    {
+        if (!empty($element['xml_base_explicit']) && isset($element['xml_base'])) {
+            return $element['xml_base'];
+        }
+        $link = $this->get_permalink();
+        if ($link != null) {
+            return $link;
+        }
+        return $this->feed->get_base($element);
+    }
+
+    /**
+     * Sanitize feed data
+     *
+     * @access private
+     * @see \SimplePie\SimplePie::sanitize()
+     * @param string $data Data to sanitize
+     * @param int $type One of the \SimplePie\SimplePie::CONSTRUCT_* constants
+     * @param string $base Base URL to resolve URLs against
+     * @return string Sanitized data
+     */
+    public function sanitize($data, $type, $base = '')
+    {
+        return $this->feed->sanitize($data, $type, $base);
+    }
+
+    /**
+     * Get the parent feed
+     *
+     * Note: this may not work as you think for multifeeds!
+     *
+     * @link http://simplepie.org/faq/typical_multifeed_gotchas#missing_data_from_feed
+     * @since 1.0
+     * @return \SimplePie\SimplePie
+     */
+    public function get_feed()
+    {
+        return $this->feed;
+    }
+
+    /**
+     * Get the unique identifier for the item
+     *
+     * This is usually used when writing code to check for new items in a feed.
+     *
+     * Uses `<atom:id>`, `<guid>`, `<dc:identifier>` or the `about` attribute
+     * for RDF. If none of these are supplied (or `$hash` is true), creates an
+     * MD5 hash based on the permalink, title and content.
+     *
+     * @since Beta 2
+     * @param boolean $hash Should we force using a hash instead of the supplied ID?
+     * @param string|false $fn User-supplied function to generate an hash
+     * @return string|null
+     */
+    public function get_id($hash = false, $fn = 'md5')
+    {
+        if (!$hash) {
+            if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'id')) {
+                return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'id')) {
+                return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'guid')) {
+                return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'identifier')) {
+                return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'identifier')) {
+                return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } elseif (isset($this->data['attribs'][\SimplePie\SimplePie::NAMESPACE_RDF]['about'])) {
+                return $this->sanitize($this->data['attribs'][\SimplePie\SimplePie::NAMESPACE_RDF]['about'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+        }
+        if ($fn === false) {
+            return null;
+        } elseif (!is_callable($fn)) {
+            trigger_error('User-supplied function $fn must be callable', E_USER_WARNING);
+            $fn = 'md5';
+        }
+        return call_user_func(
+            $fn,
+            $this->get_permalink().$this->get_title().$this->get_content()
+        );
+    }
+
+    /**
+     * Get the title of the item
+     *
+     * Uses `<atom:title>`, `<title>` or `<dc:title>`
+     *
+     * @since Beta 2 (previously called `get_item_title` since 0.8)
+     * @return string|null
+     */
+    public function get_title()
+    {
+        if (!isset($this->data['title'])) {
+            if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'title')) {
+                $this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'title')) {
+                $this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_10, 'title')) {
+                $this->data['title'] = $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_090, 'title')) {
+                $this->data['title'] = $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'title')) {
+                $this->data['title'] = $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'title')) {
+                $this->data['title'] = $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'title')) {
+                $this->data['title'] = $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } else {
+                $this->data['title'] = null;
+            }
+        }
+        return $this->data['title'];
+    }
+
+    /**
+     * Get the content for the item
+     *
+     * Prefers summaries over full content , but will return full content if a
+     * summary does not exist.
+     *
+     * To prefer full content instead, use {@see get_content}
+     *
+     * Uses `<atom:summary>`, `<description>`, `<dc:description>` or
+     * `<itunes:subtitle>`
+     *
+     * @since 0.8
+     * @param boolean $description_only Should we avoid falling back to the content?
+     * @return string|null
+     */
+    public function get_description($description_only = false)
+    {
+        if (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'summary')) &&
+            ($return = $this->sanitize($tags[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$tags[0]['attribs']]), $this->get_base($tags[0])))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'summary')) &&
+                ($return = $this->sanitize($tags[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$tags[0]['attribs']]), $this->get_base($tags[0])))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_10, 'description')) &&
+                ($return = $this->sanitize($tags[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0])))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'description')) &&
+                ($return = $this->sanitize($tags[0]['data'], \SimplePie\SimplePie::CONSTRUCT_HTML, $this->get_base($tags[0])))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'description')) &&
+                ($return = $this->sanitize($tags[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'description')) &&
+                ($return = $this->sanitize($tags[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'summary')) &&
+                ($return = $this->sanitize($tags[0]['data'], \SimplePie\SimplePie::CONSTRUCT_HTML, $this->get_base($tags[0])))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'subtitle')) &&
+                ($return = $this->sanitize($tags[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_090, 'description')) &&
+                ($return = $this->sanitize($tags[0]['data'], \SimplePie\SimplePie::CONSTRUCT_HTML))) {
+            return $return;
+        } elseif (!$description_only) {
+            return $this->get_content(true);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the content for the item
+     *
+     * Prefers full content over summaries, but will return a summary if full
+     * content does not exist.
+     *
+     * To prefer summaries instead, use {@see get_description}
+     *
+     * Uses `<atom:content>` or `<content:encoded>` (RSS 1.0 Content Module)
+     *
+     * @since 1.0
+     * @param boolean $content_only Should we avoid falling back to the description?
+     * @return string|null
+     */
+    public function get_content($content_only = false)
+    {
+        if (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'content')) &&
+            ($return = $this->sanitize($tags[0]['data'], $this->registry->call(Misc::class, 'atom_10_content_construct_type', [$tags[0]['attribs']]), $this->get_base($tags[0])))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'content')) &&
+                ($return = $this->sanitize($tags[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$tags[0]['attribs']]), $this->get_base($tags[0])))) {
+            return $return;
+        } elseif (($tags = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
+                ($return = $this->sanitize($tags[0]['data'], \SimplePie\SimplePie::CONSTRUCT_HTML, $this->get_base($tags[0])))) {
+            return $return;
+        } elseif (!$content_only) {
+            return $this->get_description(true);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the media:thumbnail of the item
+     *
+     * Uses `<media:thumbnail>`
+     *
+     *
+     * @return array|null
+     */
+    public function get_thumbnail()
+    {
+        if (!isset($this->data['thumbnail'])) {
+            if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'thumbnail')) {
+                $thumbnail = $return[0]['attribs'][''];
+                if (empty($thumbnail['url'])) {
+                    $this->data['thumbnail'] = null;
+                } else {
+                    $thumbnail['url'] = $this->sanitize($thumbnail['url'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($return[0]));
+                    $this->data['thumbnail'] = $thumbnail;
+                }
+            } else {
+                $this->data['thumbnail'] = null;
+            }
+        }
+        return $this->data['thumbnail'];
+    }
+
+    /**
+     * Get a category for the item
+     *
+     * @since Beta 3 (previously called `get_categories()` since Beta 2)
+     * @param int $key The category that you want to return.  Remember that arrays begin with 0, not 1
+     * @return \SimplePie\Category|null
+     */
+    public function get_category($key = 0)
+    {
+        $categories = $this->get_categories();
+        if (isset($categories[$key])) {
+            return $categories[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all categories for the item
+     *
+     * Uses `<atom:category>`, `<category>` or `<dc:subject>`
+     *
+     * @since Beta 3
+     * @return \SimplePie\Category[]|null List of {@see \SimplePie\Category} objects
+     */
+    public function get_categories()
+    {
+        $categories = [];
+
+        $type = 'category';
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, $type) as $category) {
+            $term = null;
+            $scheme = null;
+            $label = null;
+            if (isset($category['attribs']['']['term'])) {
+                $term = $this->sanitize($category['attribs']['']['term'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($category['attribs']['']['scheme'])) {
+                $scheme = $this->sanitize($category['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($category['attribs']['']['label'])) {
+                $label = $this->sanitize($category['attribs']['']['label'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            $categories[] = $this->registry->create(Category::class, [$term, $scheme, $label, $type]);
+        }
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, $type) as $category) {
+            // This is really the label, but keep this as the term also for BC.
+            // Label will also work on retrieving because that falls back to term.
+            $term = $this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            if (isset($category['attribs']['']['domain'])) {
+                $scheme = $this->sanitize($category['attribs']['']['domain'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } else {
+                $scheme = null;
+            }
+            $categories[] = $this->registry->create(Category::class, [$term, $scheme, null, $type]);
+        }
+
+        $type = 'subject';
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, $type) as $category) {
+            $categories[] = $this->registry->create(Category::class, [$this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null, $type]);
+        }
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, $type) as $category) {
+            $categories[] = $this->registry->create(Category::class, [$this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null, $type]);
+        }
+
+        if (!empty($categories)) {
+            return array_unique($categories);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get an author for the item
+     *
+     * @since Beta 2
+     * @param int $key The author that you want to return.  Remember that arrays begin with 0, not 1
+     * @return \SimplePie\Author|null
+     */
+    public function get_author($key = 0)
+    {
+        $authors = $this->get_authors();
+        if (isset($authors[$key])) {
+            return $authors[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a contributor for the item
+     *
+     * @since 1.1
+     * @param int $key The contrbutor that you want to return.  Remember that arrays begin with 0, not 1
+     * @return \SimplePie\Author|null
+     */
+    public function get_contributor($key = 0)
+    {
+        $contributors = $this->get_contributors();
+        if (isset($contributors[$key])) {
+            return $contributors[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all contributors for the item
+     *
+     * Uses `<atom:contributor>`
+     *
+     * @since 1.1
+     * @return \SimplePie\Author[]|null List of {@see \SimplePie\Author} objects
+     */
+    public function get_contributors()
+    {
+        $contributors = [];
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'contributor') as $contributor) {
+            $name = null;
+            $uri = null;
+            $email = null;
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['name'][0]['data'])) {
+                $name = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['name'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]['data'])) {
+                $uri = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]));
+            }
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['email'][0]['data'])) {
+                $email = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['email'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $uri !== null) {
+                $contributors[] = $this->registry->create(Author::class, [$name, $uri, $email]);
+            }
+        }
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'contributor') as $contributor) {
+            $name = null;
+            $url = null;
+            $email = null;
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['name'][0]['data'])) {
+                $name = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['name'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]['data'])) {
+                $url = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]));
+            }
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['email'][0]['data'])) {
+                $email = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['email'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $url !== null) {
+                $contributors[] = $this->registry->create(Author::class, [$name, $url, $email]);
+            }
+        }
+
+        if (!empty($contributors)) {
+            return array_unique($contributors);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all authors for the item
+     *
+     * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>`
+     *
+     * @since Beta 2
+     * @return \SimplePie\Author[]|null List of {@see \SimplePie\Author} objects
+     */
+    public function get_authors()
+    {
+        $authors = [];
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'author') as $author) {
+            $name = null;
+            $uri = null;
+            $email = null;
+            if (isset($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['name'][0]['data'])) {
+                $name = $this->sanitize($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['name'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]['data'])) {
+                $uri = $this->sanitize($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]));
+            }
+            if (isset($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['email'][0]['data'])) {
+                $email = $this->sanitize($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['email'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $uri !== null) {
+                $authors[] = $this->registry->create(Author::class, [$name, $uri, $email]);
+            }
+        }
+        if ($author = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'author')) {
+            $name = null;
+            $url = null;
+            $email = null;
+            if (isset($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['name'][0]['data'])) {
+                $name = $this->sanitize($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['name'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]['data'])) {
+                $url = $this->sanitize($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]));
+            }
+            if (isset($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['email'][0]['data'])) {
+                $email = $this->sanitize($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['email'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $url !== null) {
+                $authors[] = $this->registry->create(Author::class, [$name, $url, $email]);
+            }
+        }
+        if ($author = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'author')) {
+            $authors[] = $this->registry->create(Author::class, [null, null, $this->sanitize($author[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT)]);
+        }
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'creator') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null]);
+        }
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'creator') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null]);
+        }
+        foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'author') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null]);
+        }
+
+        if (!empty($authors)) {
+            return array_unique($authors);
+        } elseif (($source = $this->get_source()) && ($authors = $source->get_authors())) {
+            return $authors;
+        } elseif ($authors = $this->feed->get_authors()) {
+            return $authors;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the copyright info for the item
+     *
+     * Uses `<atom:rights>` or `<dc:rights>`
+     *
+     * @since 1.1
+     * @return string
+     */
+    public function get_copyright()
+    {
+        if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'rights')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'rights')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'rights')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the posting date/time for the item
+     *
+     * Uses `<atom:published>`, `<atom:updated>`, `<atom:issued>`,
+     * `<atom:modified>`, `<pubDate>` or `<dc:date>`
+     *
+     * Note: obeys PHP's timezone setting. To get a UTC date/time, use
+     * {@see get_gmdate}
+     *
+     * @since Beta 2 (previously called `get_item_date` since 0.8)
+     *
+     * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data)
+     * @return int|string|null
+     */
+    public function get_date($date_format = 'j F Y, g:i a')
+    {
+        if (!isset($this->data['date'])) {
+            if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'published')) {
+                $this->data['date']['raw'] = $return[0]['data'];
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'pubDate')) {
+                $this->data['date']['raw'] = $return[0]['data'];
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'date')) {
+                $this->data['date']['raw'] = $return[0]['data'];
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'date')) {
+                $this->data['date']['raw'] = $return[0]['data'];
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'updated')) {
+                $this->data['date']['raw'] = $return[0]['data'];
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'issued')) {
+                $this->data['date']['raw'] = $return[0]['data'];
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'created')) {
+                $this->data['date']['raw'] = $return[0]['data'];
+            } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'modified')) {
+                $this->data['date']['raw'] = $return[0]['data'];
+            }
+
+            if (!empty($this->data['date']['raw'])) {
+                $parser = $this->registry->call(Parse\Date::class, 'get');
+                $this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']) ?: null;
+            } else {
+                $this->data['date'] = null;
+            }
+        }
+        if ($this->data['date']) {
+            $date_format = (string) $date_format;
+            switch ($date_format) {
+                case '':
+                    return $this->sanitize($this->data['date']['raw'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+
+                case 'U':
+                    return $this->data['date']['parsed'];
+
+                default:
+                    return date($date_format, $this->data['date']['parsed']);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the update date/time for the item
+     *
+     * Uses `<atom:updated>`
+     *
+     * Note: obeys PHP's timezone setting. To get a UTC date/time, use
+     * {@see get_gmdate}
+     *
+     * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data)
+     * @return int|string|null
+     */
+    public function get_updated_date($date_format = 'j F Y, g:i a')
+    {
+        if (!isset($this->data['updated'])) {
+            if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'updated')) {
+                $this->data['updated']['raw'] = $return[0]['data'];
+            }
+
+            if (!empty($this->data['updated']['raw'])) {
+                $parser = $this->registry->call(Parse\Date::class, 'get');
+                $this->data['updated']['parsed'] = $parser->parse($this->data['updated']['raw']) ?: null;
+            } else {
+                $this->data['updated'] = null;
+            }
+        }
+        if ($this->data['updated']) {
+            $date_format = (string) $date_format;
+            switch ($date_format) {
+                case '':
+                    return $this->sanitize($this->data['updated']['raw'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+
+                case 'U':
+                    return $this->data['updated']['parsed'];
+
+                default:
+                    return date($date_format, $this->data['updated']['parsed']);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the localized posting date/time for the item
+     *
+     * Returns the date formatted in the localized language. To display in
+     * languages other than the server's default, you need to change the locale
+     * with {@link http://php.net/setlocale setlocale()}. The available
+     * localizations depend on which ones are installed on your web server.
+     *
+     * @since 1.0
+     *
+     * @param string $date_format Supports any PHP date format from {@see http://php.net/strftime} (empty for the raw data)
+     * @return int|string|null
+     */
+    public function get_local_date($date_format = '%c')
+    {
+        if (!$date_format) {
+            return $this->sanitize($this->get_date(''), \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif (($date = $this->get_date('U')) !== null && $date !== false) {
+            return strftime($date_format, $date);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the posting date/time for the item (UTC time)
+     *
+     * @see get_date
+     * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
+     * @return int|string|null
+     */
+    public function get_gmdate($date_format = 'j F Y, g:i a')
+    {
+        $date = $this->get_date('U');
+        if ($date === null) {
+            return null;
+        }
+
+        return gmdate($date_format, $date);
+    }
+
+    /**
+     * Get the update date/time for the item (UTC time)
+     *
+     * @see get_updated_date
+     * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
+     * @return int|string|null
+     */
+    public function get_updated_gmdate($date_format = 'j F Y, g:i a')
+    {
+        $date = $this->get_updated_date('U');
+        if ($date === null) {
+            return null;
+        }
+
+        return gmdate($date_format, $date);
+    }
+
+    /**
+     * Get the permalink for the item
+     *
+     * Returns the first link available with a relationship of "alternate".
+     * Identical to {@see get_link()} with key 0
+     *
+     * @see get_link
+     * @since 0.8
+     * @return string|null Permalink URL
+     */
+    public function get_permalink()
+    {
+        $link = $this->get_link();
+        $enclosure = $this->get_enclosure(0);
+        if ($link !== null) {
+            return $link;
+        } elseif ($enclosure !== null) {
+            return $enclosure->get_link();
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single link for the item
+     *
+     * @since Beta 3
+     * @param int $key The link that you want to return.  Remember that arrays begin with 0, not 1
+     * @param string $rel The relationship of the link to return
+     * @return string|null Link URL
+     */
+    public function get_link($key = 0, $rel = 'alternate')
+    {
+        $links = $this->get_links($rel);
+        if ($links && $links[$key] !== null) {
+            return $links[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all links for the item
+     *
+     * Uses `<atom:link>`, `<link>` or `<guid>`
+     *
+     * @since Beta 2
+     * @param string $rel The relationship of links to return
+     * @return array|null Links found for the item (strings)
+     */
+    public function get_links($rel = 'alternate')
+    {
+        if (!isset($this->data['links'])) {
+            $this->data['links'] = [];
+            foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'link') as $link) {
+                if (isset($link['attribs']['']['href'])) {
+                    $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+                    $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($link));
+                }
+            }
+            foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'link') as $link) {
+                if (isset($link['attribs']['']['href'])) {
+                    $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+                    $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($link));
+                }
+            }
+            if ($links = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_10, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+            if ($links = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_090, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+            if ($links = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+            if ($links = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'guid')) {
+                if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true') {
+                    $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($links[0]));
+                }
+            }
+
+            $keys = array_keys($this->data['links']);
+            foreach ($keys as $key) {
+                if ($this->registry->call(Misc::class, 'is_isegment_nz_nc', [$key])) {
+                    if (isset($this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key])) {
+                        $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key]);
+                        $this->data['links'][$key] = &$this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key];
+                    } else {
+                        $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] = &$this->data['links'][$key];
+                    }
+                } elseif (substr($key, 0, 41) === \SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY) {
+                    $this->data['links'][substr($key, 41)] = &$this->data['links'][$key];
+                }
+                $this->data['links'][$key] = array_unique($this->data['links'][$key]);
+            }
+        }
+        if (isset($this->data['links'][$rel])) {
+            return $this->data['links'][$rel];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get an enclosure from the item
+     *
+     * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
+     *
+     * @since Beta 2
+     * @todo Add ability to prefer one type of content over another (in a media group).
+     * @param int $key The enclosure that you want to return.  Remember that arrays begin with 0, not 1
+     * @return \SimplePie\Enclosure|null
+     */
+    public function get_enclosure($key = 0, $prefer = null)
+    {
+        $enclosures = $this->get_enclosures();
+        if (isset($enclosures[$key])) {
+            return $enclosures[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all available enclosures (podcasts, etc.)
+     *
+     * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
+     *
+     * At this point, we're pretty much assuming that all enclosures for an item
+     * are the same content.  Anything else is too complicated to
+     * properly support.
+     *
+     * @since Beta 2
+     * @todo Add support for end-user defined sorting of enclosures by type/handler (so we can prefer the faster-loading FLV over MP4).
+     * @todo If an element exists at a level, but its value is empty, we should fall back to the value from the parent (if it exists).
+     * @return \SimplePie\Enclosure[]|null List of \SimplePie\Enclosure items
+     */
+    public function get_enclosures()
+    {
+        if (!isset($this->data['enclosures'])) {
+            $this->data['enclosures'] = [];
+
+            // Elements
+            $captions_parent = null;
+            $categories_parent = null;
+            $copyrights_parent = null;
+            $credits_parent = null;
+            $description_parent = null;
+            $duration_parent = null;
+            $hashes_parent = null;
+            $keywords_parent = null;
+            $player_parent = null;
+            $ratings_parent = null;
+            $restrictions_parent = null;
+            $thumbnails_parent = null;
+            $title_parent = null;
+
+            // Let's do the channel and item-level ones first, and just re-use them if we need to.
+            $parent = $this->get_feed();
+
+            // CAPTIONS
+            if ($captions = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'text')) {
+                foreach ($captions as $caption) {
+                    $caption_type = null;
+                    $caption_lang = null;
+                    $caption_startTime = null;
+                    $caption_endTime = null;
+                    $caption_text = null;
+                    if (isset($caption['attribs']['']['type'])) {
+                        $caption_type = $this->sanitize($caption['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($caption['attribs']['']['lang'])) {
+                        $caption_lang = $this->sanitize($caption['attribs']['']['lang'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($caption['attribs']['']['start'])) {
+                        $caption_startTime = $this->sanitize($caption['attribs']['']['start'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($caption['attribs']['']['end'])) {
+                        $caption_endTime = $this->sanitize($caption['attribs']['']['end'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($caption['data'])) {
+                        $caption_text = $this->sanitize($caption['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $captions_parent[] = $this->registry->create(Caption::class, [$caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text]);
+                }
+            } elseif ($captions = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'text')) {
+                foreach ($captions as $caption) {
+                    $caption_type = null;
+                    $caption_lang = null;
+                    $caption_startTime = null;
+                    $caption_endTime = null;
+                    $caption_text = null;
+                    if (isset($caption['attribs']['']['type'])) {
+                        $caption_type = $this->sanitize($caption['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($caption['attribs']['']['lang'])) {
+                        $caption_lang = $this->sanitize($caption['attribs']['']['lang'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($caption['attribs']['']['start'])) {
+                        $caption_startTime = $this->sanitize($caption['attribs']['']['start'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($caption['attribs']['']['end'])) {
+                        $caption_endTime = $this->sanitize($caption['attribs']['']['end'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($caption['data'])) {
+                        $caption_text = $this->sanitize($caption['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $captions_parent[] = $this->registry->create(Caption::class, [$caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text]);
+                }
+            }
+            if (is_array($captions_parent)) {
+                $captions_parent = array_values(array_unique($captions_parent));
+            }
+
+            // CATEGORIES
+            foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'category') as $category) {
+                $term = null;
+                $scheme = null;
+                $label = null;
+                if (isset($category['data'])) {
+                    $term = $this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                if (isset($category['attribs']['']['scheme'])) {
+                    $scheme = $this->sanitize($category['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                } else {
+                    $scheme = 'http://search.yahoo.com/mrss/category_schema';
+                }
+                if (isset($category['attribs']['']['label'])) {
+                    $label = $this->sanitize($category['attribs']['']['label'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                $categories_parent[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+            }
+            foreach ((array) $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'category') as $category) {
+                $term = null;
+                $scheme = null;
+                $label = null;
+                if (isset($category['data'])) {
+                    $term = $this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                if (isset($category['attribs']['']['scheme'])) {
+                    $scheme = $this->sanitize($category['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                } else {
+                    $scheme = 'http://search.yahoo.com/mrss/category_schema';
+                }
+                if (isset($category['attribs']['']['label'])) {
+                    $label = $this->sanitize($category['attribs']['']['label'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                $categories_parent[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+            }
+            foreach ((array) $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'category') as $category) {
+                $term = null;
+                $scheme = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
+                $label = null;
+                if (isset($category['attribs']['']['text'])) {
+                    $label = $this->sanitize($category['attribs']['']['text'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                $categories_parent[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+
+                if (isset($category['child'][\SimplePie\SimplePie::NAMESPACE_ITUNES]['category'])) {
+                    foreach ((array) $category['child'][\SimplePie\SimplePie::NAMESPACE_ITUNES]['category'] as $subcategory) {
+                        if (isset($subcategory['attribs']['']['text'])) {
+                            $label = $this->sanitize($subcategory['attribs']['']['text'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        $categories_parent[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+                    }
+                }
+            }
+            if (is_array($categories_parent)) {
+                $categories_parent = array_values(array_unique($categories_parent));
+            }
+
+            // COPYRIGHT
+            if ($copyright = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'copyright')) {
+                $copyright_url = null;
+                $copyright_label = null;
+                if (isset($copyright[0]['attribs']['']['url'])) {
+                    $copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                if (isset($copyright[0]['data'])) {
+                    $copyright_label = $this->sanitize($copyright[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                $copyrights_parent = $this->registry->create(Copyright::class, [$copyright_url, $copyright_label]);
+            } elseif ($copyright = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'copyright')) {
+                $copyright_url = null;
+                $copyright_label = null;
+                if (isset($copyright[0]['attribs']['']['url'])) {
+                    $copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                if (isset($copyright[0]['data'])) {
+                    $copyright_label = $this->sanitize($copyright[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+                $copyrights_parent = $this->registry->create(Copyright::class, [$copyright_url, $copyright_label]);
+            }
+
+            // CREDITS
+            if ($credits = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'credit')) {
+                foreach ($credits as $credit) {
+                    $credit_role = null;
+                    $credit_scheme = null;
+                    $credit_name = null;
+                    if (isset($credit['attribs']['']['role'])) {
+                        $credit_role = $this->sanitize($credit['attribs']['']['role'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($credit['attribs']['']['scheme'])) {
+                        $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    } else {
+                        $credit_scheme = 'urn:ebu';
+                    }
+                    if (isset($credit['data'])) {
+                        $credit_name = $this->sanitize($credit['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $credits_parent[] = $this->registry->create(Credit::class, [$credit_role, $credit_scheme, $credit_name]);
+                }
+            } elseif ($credits = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'credit')) {
+                foreach ($credits as $credit) {
+                    $credit_role = null;
+                    $credit_scheme = null;
+                    $credit_name = null;
+                    if (isset($credit['attribs']['']['role'])) {
+                        $credit_role = $this->sanitize($credit['attribs']['']['role'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($credit['attribs']['']['scheme'])) {
+                        $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    } else {
+                        $credit_scheme = 'urn:ebu';
+                    }
+                    if (isset($credit['data'])) {
+                        $credit_name = $this->sanitize($credit['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $credits_parent[] = $this->registry->create(Credit::class, [$credit_role, $credit_scheme, $credit_name]);
+                }
+            }
+            if (is_array($credits_parent)) {
+                $credits_parent = array_values(array_unique($credits_parent));
+            }
+
+            // DESCRIPTION
+            if ($description_parent = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'description')) {
+                if (isset($description_parent[0]['data'])) {
+                    $description_parent = $this->sanitize($description_parent[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+            } elseif ($description_parent = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'description')) {
+                if (isset($description_parent[0]['data'])) {
+                    $description_parent = $this->sanitize($description_parent[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+            }
+
+            // DURATION
+            if ($duration_parent = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'duration')) {
+                $seconds = null;
+                $minutes = null;
+                $hours = null;
+                if (isset($duration_parent[0]['data'])) {
+                    $temp = explode(':', $this->sanitize($duration_parent[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT));
+                    if (sizeof($temp) > 0) {
+                        $seconds = (int) array_pop($temp);
+                    }
+                    if (sizeof($temp) > 0) {
+                        $minutes = (int) array_pop($temp);
+                        $seconds += $minutes * 60;
+                    }
+                    if (sizeof($temp) > 0) {
+                        $hours = (int) array_pop($temp);
+                        $seconds += $hours * 3600;
+                    }
+                    unset($temp);
+                    $duration_parent = $seconds;
+                }
+            }
+
+            // HASHES
+            if ($hashes_iterator = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'hash')) {
+                foreach ($hashes_iterator as $hash) {
+                    $value = null;
+                    $algo = null;
+                    if (isset($hash['data'])) {
+                        $value = $this->sanitize($hash['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($hash['attribs']['']['algo'])) {
+                        $algo = $this->sanitize($hash['attribs']['']['algo'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    } else {
+                        $algo = 'md5';
+                    }
+                    $hashes_parent[] = $algo.':'.$value;
+                }
+            } elseif ($hashes_iterator = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'hash')) {
+                foreach ($hashes_iterator as $hash) {
+                    $value = null;
+                    $algo = null;
+                    if (isset($hash['data'])) {
+                        $value = $this->sanitize($hash['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($hash['attribs']['']['algo'])) {
+                        $algo = $this->sanitize($hash['attribs']['']['algo'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    } else {
+                        $algo = 'md5';
+                    }
+                    $hashes_parent[] = $algo.':'.$value;
+                }
+            }
+            if (is_array($hashes_parent)) {
+                $hashes_parent = array_values(array_unique($hashes_parent));
+            }
+
+            // KEYWORDS
+            if ($keywords = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'keywords')) {
+                if (isset($keywords[0]['data'])) {
+                    $temp = explode(',', $this->sanitize($keywords[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT));
+                    foreach ($temp as $word) {
+                        $keywords_parent[] = trim($word);
+                    }
+                }
+                unset($temp);
+            } elseif ($keywords = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'keywords')) {
+                if (isset($keywords[0]['data'])) {
+                    $temp = explode(',', $this->sanitize($keywords[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT));
+                    foreach ($temp as $word) {
+                        $keywords_parent[] = trim($word);
+                    }
+                }
+                unset($temp);
+            } elseif ($keywords = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'keywords')) {
+                if (isset($keywords[0]['data'])) {
+                    $temp = explode(',', $this->sanitize($keywords[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT));
+                    foreach ($temp as $word) {
+                        $keywords_parent[] = trim($word);
+                    }
+                }
+                unset($temp);
+            } elseif ($keywords = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'keywords')) {
+                if (isset($keywords[0]['data'])) {
+                    $temp = explode(',', $this->sanitize($keywords[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT));
+                    foreach ($temp as $word) {
+                        $keywords_parent[] = trim($word);
+                    }
+                }
+                unset($temp);
+            }
+            if (is_array($keywords_parent)) {
+                $keywords_parent = array_values(array_unique($keywords_parent));
+            }
+
+            // PLAYER
+            if ($player_parent = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'player')) {
+                if (isset($player_parent[0]['attribs']['']['url'])) {
+                    $player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                }
+            } elseif ($player_parent = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'player')) {
+                if (isset($player_parent[0]['attribs']['']['url'])) {
+                    $player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                }
+            }
+
+            // RATINGS
+            if ($ratings = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'rating')) {
+                foreach ($ratings as $rating) {
+                    $rating_scheme = null;
+                    $rating_value = null;
+                    if (isset($rating['attribs']['']['scheme'])) {
+                        $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    } else {
+                        $rating_scheme = 'urn:simple';
+                    }
+                    if (isset($rating['data'])) {
+                        $rating_value = $this->sanitize($rating['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $ratings_parent[] = $this->registry->create(Rating::class, [$rating_scheme, $rating_value]);
+                }
+            } elseif ($ratings = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'explicit')) {
+                foreach ($ratings as $rating) {
+                    $rating_scheme = 'urn:itunes';
+                    $rating_value = null;
+                    if (isset($rating['data'])) {
+                        $rating_value = $this->sanitize($rating['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $ratings_parent[] = $this->registry->create(Rating::class, [$rating_scheme, $rating_value]);
+                }
+            } elseif ($ratings = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'rating')) {
+                foreach ($ratings as $rating) {
+                    $rating_scheme = null;
+                    $rating_value = null;
+                    if (isset($rating['attribs']['']['scheme'])) {
+                        $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    } else {
+                        $rating_scheme = 'urn:simple';
+                    }
+                    if (isset($rating['data'])) {
+                        $rating_value = $this->sanitize($rating['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $ratings_parent[] = $this->registry->create(Rating::class, [$rating_scheme, $rating_value]);
+                }
+            } elseif ($ratings = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'explicit')) {
+                foreach ($ratings as $rating) {
+                    $rating_scheme = 'urn:itunes';
+                    $rating_value = null;
+                    if (isset($rating['data'])) {
+                        $rating_value = $this->sanitize($rating['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $ratings_parent[] = $this->registry->create(Rating::class, [$rating_scheme, $rating_value]);
+                }
+            }
+            if (is_array($ratings_parent)) {
+                $ratings_parent = array_values(array_unique($ratings_parent));
+            }
+
+            // RESTRICTIONS
+            if ($restrictions = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'restriction')) {
+                foreach ($restrictions as $restriction) {
+                    $restriction_relationship = null;
+                    $restriction_type = null;
+                    $restriction_value = null;
+                    if (isset($restriction['attribs']['']['relationship'])) {
+                        $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($restriction['attribs']['']['type'])) {
+                        $restriction_type = $this->sanitize($restriction['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($restriction['data'])) {
+                        $restriction_value = $this->sanitize($restriction['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $restrictions_parent[] = $this->registry->create(Restriction::class, [$restriction_relationship, $restriction_type, $restriction_value]);
+                }
+            } elseif ($restrictions = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'block')) {
+                foreach ($restrictions as $restriction) {
+                    $restriction_relationship = 'allow';
+                    $restriction_type = null;
+                    $restriction_value = 'itunes';
+                    if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes') {
+                        $restriction_relationship = 'deny';
+                    }
+                    $restrictions_parent[] = $this->registry->create(Restriction::class, [$restriction_relationship, $restriction_type, $restriction_value]);
+                }
+            } elseif ($restrictions = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'restriction')) {
+                foreach ($restrictions as $restriction) {
+                    $restriction_relationship = null;
+                    $restriction_type = null;
+                    $restriction_value = null;
+                    if (isset($restriction['attribs']['']['relationship'])) {
+                        $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($restriction['attribs']['']['type'])) {
+                        $restriction_type = $this->sanitize($restriction['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($restriction['data'])) {
+                        $restriction_value = $this->sanitize($restriction['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    $restrictions_parent[] = $this->registry->create(Restriction::class, [$restriction_relationship, $restriction_type, $restriction_value]);
+                }
+            } elseif ($restrictions = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'block')) {
+                foreach ($restrictions as $restriction) {
+                    $restriction_relationship = 'allow';
+                    $restriction_type = null;
+                    $restriction_value = 'itunes';
+                    if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes') {
+                        $restriction_relationship = 'deny';
+                    }
+                    $restrictions_parent[] = $this->registry->create(Restriction::class, [$restriction_relationship, $restriction_type, $restriction_value]);
+                }
+            }
+            if (is_array($restrictions_parent)) {
+                $restrictions_parent = array_values(array_unique($restrictions_parent));
+            } else {
+                $restrictions_parent = [new \SimplePie\Restriction('allow', null, 'default')];
+            }
+
+            // THUMBNAILS
+            if ($thumbnails = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'thumbnail')) {
+                foreach ($thumbnails as $thumbnail) {
+                    if (isset($thumbnail['attribs']['']['url'])) {
+                        $thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                    }
+                }
+            } elseif ($thumbnails = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'thumbnail')) {
+                foreach ($thumbnails as $thumbnail) {
+                    if (isset($thumbnail['attribs']['']['url'])) {
+                        $thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                    }
+                }
+            }
+
+            // TITLES
+            if ($title_parent = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'title')) {
+                if (isset($title_parent[0]['data'])) {
+                    $title_parent = $this->sanitize($title_parent[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+            } elseif ($title_parent = $parent->get_channel_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'title')) {
+                if (isset($title_parent[0]['data'])) {
+                    $title_parent = $this->sanitize($title_parent[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                }
+            }
+
+            // Clear the memory
+            unset($parent);
+
+            // Attributes
+            $bitrate = null;
+            $channels = null;
+            $duration = null;
+            $expression = null;
+            $framerate = null;
+            $height = null;
+            $javascript = null;
+            $lang = null;
+            $length = null;
+            $medium = null;
+            $samplingrate = null;
+            $type = null;
+            $url = null;
+            $width = null;
+
+            // Elements
+            $captions = null;
+            $categories = null;
+            $copyrights = null;
+            $credits = null;
+            $description = null;
+            $hashes = null;
+            $keywords = null;
+            $player = null;
+            $ratings = null;
+            $restrictions = null;
+            $thumbnails = null;
+            $title = null;
+
+            // If we have media:group tags, loop through them.
+            foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'group') as $group) {
+                if (isset($group['child']) && isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['content'])) {
+                    // If we have media:content tags, loop through them.
+                    foreach ((array) $group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['content'] as $content) {
+                        if (isset($content['attribs']['']['url'])) {
+                            // Attributes
+                            $bitrate = null;
+                            $channels = null;
+                            $duration = null;
+                            $expression = null;
+                            $framerate = null;
+                            $height = null;
+                            $javascript = null;
+                            $lang = null;
+                            $length = null;
+                            $medium = null;
+                            $samplingrate = null;
+                            $type = null;
+                            $url = null;
+                            $width = null;
+
+                            // Elements
+                            $captions = null;
+                            $categories = null;
+                            $copyrights = null;
+                            $credits = null;
+                            $description = null;
+                            $hashes = null;
+                            $keywords = null;
+                            $player = null;
+                            $ratings = null;
+                            $restrictions = null;
+                            $thumbnails = null;
+                            $title = null;
+
+                            // Start checking the attributes of media:content
+                            if (isset($content['attribs']['']['bitrate'])) {
+                                $bitrate = $this->sanitize($content['attribs']['']['bitrate'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['channels'])) {
+                                $channels = $this->sanitize($content['attribs']['']['channels'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['duration'])) {
+                                $duration = $this->sanitize($content['attribs']['']['duration'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            } else {
+                                $duration = $duration_parent;
+                            }
+                            if (isset($content['attribs']['']['expression'])) {
+                                $expression = $this->sanitize($content['attribs']['']['expression'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['framerate'])) {
+                                $framerate = $this->sanitize($content['attribs']['']['framerate'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['height'])) {
+                                $height = $this->sanitize($content['attribs']['']['height'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['lang'])) {
+                                $lang = $this->sanitize($content['attribs']['']['lang'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['fileSize'])) {
+                                $length = intval($content['attribs']['']['fileSize']);
+                            }
+                            if (isset($content['attribs']['']['medium'])) {
+                                $medium = $this->sanitize($content['attribs']['']['medium'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['samplingrate'])) {
+                                $samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['type'])) {
+                                $type = $this->sanitize($content['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['attribs']['']['width'])) {
+                                $width = $this->sanitize($content['attribs']['']['width'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            $url = $this->sanitize($content['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+
+                            // Checking the other optional media: elements. Priority: media:content, media:group, item, channel
+
+                            // CAPTIONS
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['text'])) {
+                                foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['text'] as $caption) {
+                                    $caption_type = null;
+                                    $caption_lang = null;
+                                    $caption_startTime = null;
+                                    $caption_endTime = null;
+                                    $caption_text = null;
+                                    if (isset($caption['attribs']['']['type'])) {
+                                        $caption_type = $this->sanitize($caption['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($caption['attribs']['']['lang'])) {
+                                        $caption_lang = $this->sanitize($caption['attribs']['']['lang'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($caption['attribs']['']['start'])) {
+                                        $caption_startTime = $this->sanitize($caption['attribs']['']['start'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($caption['attribs']['']['end'])) {
+                                        $caption_endTime = $this->sanitize($caption['attribs']['']['end'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($caption['data'])) {
+                                        $caption_text = $this->sanitize($caption['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $captions[] = $this->registry->create(Caption::class, [$caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text]);
+                                }
+                                if (is_array($captions)) {
+                                    $captions = array_values(array_unique($captions));
+                                }
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['text'])) {
+                                foreach ($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['text'] as $caption) {
+                                    $caption_type = null;
+                                    $caption_lang = null;
+                                    $caption_startTime = null;
+                                    $caption_endTime = null;
+                                    $caption_text = null;
+                                    if (isset($caption['attribs']['']['type'])) {
+                                        $caption_type = $this->sanitize($caption['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($caption['attribs']['']['lang'])) {
+                                        $caption_lang = $this->sanitize($caption['attribs']['']['lang'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($caption['attribs']['']['start'])) {
+                                        $caption_startTime = $this->sanitize($caption['attribs']['']['start'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($caption['attribs']['']['end'])) {
+                                        $caption_endTime = $this->sanitize($caption['attribs']['']['end'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($caption['data'])) {
+                                        $caption_text = $this->sanitize($caption['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $captions[] = $this->registry->create(Caption::class, [$caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text]);
+                                }
+                                if (is_array($captions)) {
+                                    $captions = array_values(array_unique($captions));
+                                }
+                            } else {
+                                $captions = $captions_parent;
+                            }
+
+                            // CATEGORIES
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['category'])) {
+                                foreach ((array) $content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['category'] as $category) {
+                                    $term = null;
+                                    $scheme = null;
+                                    $label = null;
+                                    if (isset($category['data'])) {
+                                        $term = $this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($category['attribs']['']['scheme'])) {
+                                        $scheme = $this->sanitize($category['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    } else {
+                                        $scheme = 'http://search.yahoo.com/mrss/category_schema';
+                                    }
+                                    if (isset($category['attribs']['']['label'])) {
+                                        $label = $this->sanitize($category['attribs']['']['label'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $categories[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+                                }
+                            }
+                            if (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['category'])) {
+                                foreach ((array) $group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['category'] as $category) {
+                                    $term = null;
+                                    $scheme = null;
+                                    $label = null;
+                                    if (isset($category['data'])) {
+                                        $term = $this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($category['attribs']['']['scheme'])) {
+                                        $scheme = $this->sanitize($category['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    } else {
+                                        $scheme = 'http://search.yahoo.com/mrss/category_schema';
+                                    }
+                                    if (isset($category['attribs']['']['label'])) {
+                                        $label = $this->sanitize($category['attribs']['']['label'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $categories[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+                                }
+                            }
+                            if (is_array($categories) && is_array($categories_parent)) {
+                                $categories = array_values(array_unique(array_merge($categories, $categories_parent)));
+                            } elseif (is_array($categories)) {
+                                $categories = array_values(array_unique($categories));
+                            } elseif (is_array($categories_parent)) {
+                                $categories = array_values(array_unique($categories_parent));
+                            }
+
+                            // COPYRIGHTS
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'])) {
+                                $copyright_url = null;
+                                $copyright_label = null;
+                                if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'])) {
+                                    $copyright_url = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['data'])) {
+                                    $copyright_label = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                $copyrights = $this->registry->create(Copyright::class, [$copyright_url, $copyright_label]);
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'])) {
+                                $copyright_url = null;
+                                $copyright_label = null;
+                                if (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'])) {
+                                    $copyright_url = $this->sanitize($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['data'])) {
+                                    $copyright_label = $this->sanitize($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                $copyrights = $this->registry->create(Copyright::class, [$copyright_url, $copyright_label]);
+                            } else {
+                                $copyrights = $copyrights_parent;
+                            }
+
+                            // CREDITS
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['credit'])) {
+                                foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['credit'] as $credit) {
+                                    $credit_role = null;
+                                    $credit_scheme = null;
+                                    $credit_name = null;
+                                    if (isset($credit['attribs']['']['role'])) {
+                                        $credit_role = $this->sanitize($credit['attribs']['']['role'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($credit['attribs']['']['scheme'])) {
+                                        $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    } else {
+                                        $credit_scheme = 'urn:ebu';
+                                    }
+                                    if (isset($credit['data'])) {
+                                        $credit_name = $this->sanitize($credit['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $credits[] = $this->registry->create(Credit::class, [$credit_role, $credit_scheme, $credit_name]);
+                                }
+                                if (is_array($credits)) {
+                                    $credits = array_values(array_unique($credits));
+                                }
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['credit'])) {
+                                foreach ($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['credit'] as $credit) {
+                                    $credit_role = null;
+                                    $credit_scheme = null;
+                                    $credit_name = null;
+                                    if (isset($credit['attribs']['']['role'])) {
+                                        $credit_role = $this->sanitize($credit['attribs']['']['role'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($credit['attribs']['']['scheme'])) {
+                                        $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    } else {
+                                        $credit_scheme = 'urn:ebu';
+                                    }
+                                    if (isset($credit['data'])) {
+                                        $credit_name = $this->sanitize($credit['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $credits[] = $this->registry->create(Credit::class, [$credit_role, $credit_scheme, $credit_name]);
+                                }
+                                if (is_array($credits)) {
+                                    $credits = array_values(array_unique($credits));
+                                }
+                            } else {
+                                $credits = $credits_parent;
+                            }
+
+                            // DESCRIPTION
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['description'])) {
+                                $description = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['description'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['description'])) {
+                                $description = $this->sanitize($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['description'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            } else {
+                                $description = $description_parent;
+                            }
+
+                            // HASHES
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['hash'])) {
+                                foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['hash'] as $hash) {
+                                    $value = null;
+                                    $algo = null;
+                                    if (isset($hash['data'])) {
+                                        $value = $this->sanitize($hash['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($hash['attribs']['']['algo'])) {
+                                        $algo = $this->sanitize($hash['attribs']['']['algo'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    } else {
+                                        $algo = 'md5';
+                                    }
+                                    $hashes[] = $algo.':'.$value;
+                                }
+                                if (is_array($hashes)) {
+                                    $hashes = array_values(array_unique($hashes));
+                                }
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['hash'])) {
+                                foreach ($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['hash'] as $hash) {
+                                    $value = null;
+                                    $algo = null;
+                                    if (isset($hash['data'])) {
+                                        $value = $this->sanitize($hash['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($hash['attribs']['']['algo'])) {
+                                        $algo = $this->sanitize($hash['attribs']['']['algo'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    } else {
+                                        $algo = 'md5';
+                                    }
+                                    $hashes[] = $algo.':'.$value;
+                                }
+                                if (is_array($hashes)) {
+                                    $hashes = array_values(array_unique($hashes));
+                                }
+                            } else {
+                                $hashes = $hashes_parent;
+                            }
+
+                            // KEYWORDS
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'])) {
+                                if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'][0]['data'])) {
+                                    $temp = explode(',', $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT));
+                                    foreach ($temp as $word) {
+                                        $keywords[] = trim($word);
+                                    }
+                                    unset($temp);
+                                }
+                                if (is_array($keywords)) {
+                                    $keywords = array_values(array_unique($keywords));
+                                }
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'])) {
+                                if (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'][0]['data'])) {
+                                    $temp = explode(',', $this->sanitize($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT));
+                                    foreach ($temp as $word) {
+                                        $keywords[] = trim($word);
+                                    }
+                                    unset($temp);
+                                }
+                                if (is_array($keywords)) {
+                                    $keywords = array_values(array_unique($keywords));
+                                }
+                            } else {
+                                $keywords = $keywords_parent;
+                            }
+
+                            // PLAYER
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['player'])) {
+                                $player = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['player'])) {
+                                $player = $this->sanitize($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                            } else {
+                                $player = $player_parent;
+                            }
+
+                            // RATINGS
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['rating'])) {
+                                foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['rating'] as $rating) {
+                                    $rating_scheme = null;
+                                    $rating_value = null;
+                                    if (isset($rating['attribs']['']['scheme'])) {
+                                        $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    } else {
+                                        $rating_scheme = 'urn:simple';
+                                    }
+                                    if (isset($rating['data'])) {
+                                        $rating_value = $this->sanitize($rating['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $ratings[] = $this->registry->create(Rating::class, [$rating_scheme, $rating_value]);
+                                }
+                                if (is_array($ratings)) {
+                                    $ratings = array_values(array_unique($ratings));
+                                }
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['rating'])) {
+                                foreach ($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['rating'] as $rating) {
+                                    $rating_scheme = null;
+                                    $rating_value = null;
+                                    if (isset($rating['attribs']['']['scheme'])) {
+                                        $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    } else {
+                                        $rating_scheme = 'urn:simple';
+                                    }
+                                    if (isset($rating['data'])) {
+                                        $rating_value = $this->sanitize($rating['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $ratings[] = $this->registry->create(Rating::class, [$rating_scheme, $rating_value]);
+                                }
+                                if (is_array($ratings)) {
+                                    $ratings = array_values(array_unique($ratings));
+                                }
+                            } else {
+                                $ratings = $ratings_parent;
+                            }
+
+                            // RESTRICTIONS
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['restriction'])) {
+                                foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['restriction'] as $restriction) {
+                                    $restriction_relationship = null;
+                                    $restriction_type = null;
+                                    $restriction_value = null;
+                                    if (isset($restriction['attribs']['']['relationship'])) {
+                                        $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($restriction['attribs']['']['type'])) {
+                                        $restriction_type = $this->sanitize($restriction['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($restriction['data'])) {
+                                        $restriction_value = $this->sanitize($restriction['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $restrictions[] = $this->registry->create(Restriction::class, [$restriction_relationship, $restriction_type, $restriction_value]);
+                                }
+                                if (is_array($restrictions)) {
+                                    $restrictions = array_values(array_unique($restrictions));
+                                }
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['restriction'])) {
+                                foreach ($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['restriction'] as $restriction) {
+                                    $restriction_relationship = null;
+                                    $restriction_type = null;
+                                    $restriction_value = null;
+                                    if (isset($restriction['attribs']['']['relationship'])) {
+                                        $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($restriction['attribs']['']['type'])) {
+                                        $restriction_type = $this->sanitize($restriction['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    if (isset($restriction['data'])) {
+                                        $restriction_value = $this->sanitize($restriction['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                    }
+                                    $restrictions[] = $this->registry->create(Restriction::class, [$restriction_relationship, $restriction_type, $restriction_value]);
+                                }
+                                if (is_array($restrictions)) {
+                                    $restrictions = array_values(array_unique($restrictions));
+                                }
+                            } else {
+                                $restrictions = $restrictions_parent;
+                            }
+
+                            // THUMBNAILS
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['thumbnail'])) {
+                                foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail) {
+                                    $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                                }
+                                if (is_array($thumbnails)) {
+                                    $thumbnails = array_values(array_unique($thumbnails));
+                                }
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['thumbnail'])) {
+                                foreach ($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail) {
+                                    $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                                }
+                                if (is_array($thumbnails)) {
+                                    $thumbnails = array_values(array_unique($thumbnails));
+                                }
+                            } else {
+                                $thumbnails = $thumbnails_parent;
+                            }
+
+                            // TITLES
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['title'])) {
+                                $title = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['title'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            } elseif (isset($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['title'])) {
+                                $title = $this->sanitize($group['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['title'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            } else {
+                                $title = $title_parent;
+                            }
+
+                            $this->data['enclosures'][] = $this->registry->create(Enclosure::class, [$url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width]);
+                        }
+                    }
+                }
+            }
+
+            // If we have standalone media:content tags, loop through them.
+            if (isset($this->data['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['content'])) {
+                foreach ((array) $this->data['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['content'] as $content) {
+                    if (isset($content['attribs']['']['url']) || isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['player'])) {
+                        // Attributes
+                        $bitrate = null;
+                        $channels = null;
+                        $duration = null;
+                        $expression = null;
+                        $framerate = null;
+                        $height = null;
+                        $javascript = null;
+                        $lang = null;
+                        $length = null;
+                        $medium = null;
+                        $samplingrate = null;
+                        $type = null;
+                        $url = null;
+                        $width = null;
+
+                        // Elements
+                        $captions = null;
+                        $categories = null;
+                        $copyrights = null;
+                        $credits = null;
+                        $description = null;
+                        $hashes = null;
+                        $keywords = null;
+                        $player = null;
+                        $ratings = null;
+                        $restrictions = null;
+                        $thumbnails = null;
+                        $title = null;
+
+                        // Start checking the attributes of media:content
+                        if (isset($content['attribs']['']['bitrate'])) {
+                            $bitrate = $this->sanitize($content['attribs']['']['bitrate'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['channels'])) {
+                            $channels = $this->sanitize($content['attribs']['']['channels'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['duration'])) {
+                            $duration = $this->sanitize($content['attribs']['']['duration'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        } else {
+                            $duration = $duration_parent;
+                        }
+                        if (isset($content['attribs']['']['expression'])) {
+                            $expression = $this->sanitize($content['attribs']['']['expression'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['framerate'])) {
+                            $framerate = $this->sanitize($content['attribs']['']['framerate'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['height'])) {
+                            $height = $this->sanitize($content['attribs']['']['height'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['lang'])) {
+                            $lang = $this->sanitize($content['attribs']['']['lang'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['fileSize'])) {
+                            $length = intval($content['attribs']['']['fileSize']);
+                        }
+                        if (isset($content['attribs']['']['medium'])) {
+                            $medium = $this->sanitize($content['attribs']['']['medium'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['samplingrate'])) {
+                            $samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['type'])) {
+                            $type = $this->sanitize($content['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['width'])) {
+                            $width = $this->sanitize($content['attribs']['']['width'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        }
+                        if (isset($content['attribs']['']['url'])) {
+                            $url = $this->sanitize($content['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                        }
+                        // Checking the other optional media: elements. Priority: media:content, media:group, item, channel
+
+                        // CAPTIONS
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['text'])) {
+                            foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['text'] as $caption) {
+                                $caption_type = null;
+                                $caption_lang = null;
+                                $caption_startTime = null;
+                                $caption_endTime = null;
+                                $caption_text = null;
+                                if (isset($caption['attribs']['']['type'])) {
+                                    $caption_type = $this->sanitize($caption['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($caption['attribs']['']['lang'])) {
+                                    $caption_lang = $this->sanitize($caption['attribs']['']['lang'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($caption['attribs']['']['start'])) {
+                                    $caption_startTime = $this->sanitize($caption['attribs']['']['start'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($caption['attribs']['']['end'])) {
+                                    $caption_endTime = $this->sanitize($caption['attribs']['']['end'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($caption['data'])) {
+                                    $caption_text = $this->sanitize($caption['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                $captions[] = $this->registry->create(Caption::class, [$caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text]);
+                            }
+                            if (is_array($captions)) {
+                                $captions = array_values(array_unique($captions));
+                            }
+                        } else {
+                            $captions = $captions_parent;
+                        }
+
+                        // CATEGORIES
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['category'])) {
+                            foreach ((array) $content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['category'] as $category) {
+                                $term = null;
+                                $scheme = null;
+                                $label = null;
+                                if (isset($category['data'])) {
+                                    $term = $this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($category['attribs']['']['scheme'])) {
+                                    $scheme = $this->sanitize($category['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                } else {
+                                    $scheme = 'http://search.yahoo.com/mrss/category_schema';
+                                }
+                                if (isset($category['attribs']['']['label'])) {
+                                    $label = $this->sanitize($category['attribs']['']['label'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                $categories[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+                            }
+                        }
+                        if (is_array($categories) && is_array($categories_parent)) {
+                            $categories = array_values(array_unique(array_merge($categories, $categories_parent)));
+                        } elseif (is_array($categories)) {
+                            $categories = array_values(array_unique($categories));
+                        } elseif (is_array($categories_parent)) {
+                            $categories = array_values(array_unique($categories_parent));
+                        } else {
+                            $categories = null;
+                        }
+
+                        // COPYRIGHTS
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'])) {
+                            $copyright_url = null;
+                            $copyright_label = null;
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'])) {
+                                $copyright_url = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['data'])) {
+                                $copyright_label = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['copyright'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                            }
+                            $copyrights = $this->registry->create(Copyright::class, [$copyright_url, $copyright_label]);
+                        } else {
+                            $copyrights = $copyrights_parent;
+                        }
+
+                        // CREDITS
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['credit'])) {
+                            foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['credit'] as $credit) {
+                                $credit_role = null;
+                                $credit_scheme = null;
+                                $credit_name = null;
+                                if (isset($credit['attribs']['']['role'])) {
+                                    $credit_role = $this->sanitize($credit['attribs']['']['role'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($credit['attribs']['']['scheme'])) {
+                                    $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                } else {
+                                    $credit_scheme = 'urn:ebu';
+                                }
+                                if (isset($credit['data'])) {
+                                    $credit_name = $this->sanitize($credit['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                $credits[] = $this->registry->create(Credit::class, [$credit_role, $credit_scheme, $credit_name]);
+                            }
+                            if (is_array($credits)) {
+                                $credits = array_values(array_unique($credits));
+                            }
+                        } else {
+                            $credits = $credits_parent;
+                        }
+
+                        // DESCRIPTION
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['description'])) {
+                            $description = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['description'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        } else {
+                            $description = $description_parent;
+                        }
+
+                        // HASHES
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['hash'])) {
+                            foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['hash'] as $hash) {
+                                $value = null;
+                                $algo = null;
+                                if (isset($hash['data'])) {
+                                    $value = $this->sanitize($hash['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($hash['attribs']['']['algo'])) {
+                                    $algo = $this->sanitize($hash['attribs']['']['algo'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                } else {
+                                    $algo = 'md5';
+                                }
+                                $hashes[] = $algo.':'.$value;
+                            }
+                            if (is_array($hashes)) {
+                                $hashes = array_values(array_unique($hashes));
+                            }
+                        } else {
+                            $hashes = $hashes_parent;
+                        }
+
+                        // KEYWORDS
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'])) {
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'][0]['data'])) {
+                                $temp = explode(',', $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['keywords'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT));
+                                foreach ($temp as $word) {
+                                    $keywords[] = trim($word);
+                                }
+                                unset($temp);
+                            }
+                            if (is_array($keywords)) {
+                                $keywords = array_values(array_unique($keywords));
+                            }
+                        } else {
+                            $keywords = $keywords_parent;
+                        }
+
+                        // PLAYER
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['player'])) {
+                            if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'])) {
+                                $player = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                            }
+                        } else {
+                            $player = $player_parent;
+                        }
+
+                        // RATINGS
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['rating'])) {
+                            foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['rating'] as $rating) {
+                                $rating_scheme = null;
+                                $rating_value = null;
+                                if (isset($rating['attribs']['']['scheme'])) {
+                                    $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                } else {
+                                    $rating_scheme = 'urn:simple';
+                                }
+                                if (isset($rating['data'])) {
+                                    $rating_value = $this->sanitize($rating['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                $ratings[] = $this->registry->create(Rating::class, [$rating_scheme, $rating_value]);
+                            }
+                            if (is_array($ratings)) {
+                                $ratings = array_values(array_unique($ratings));
+                            }
+                        } else {
+                            $ratings = $ratings_parent;
+                        }
+
+                        // RESTRICTIONS
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['restriction'])) {
+                            foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['restriction'] as $restriction) {
+                                $restriction_relationship = null;
+                                $restriction_type = null;
+                                $restriction_value = null;
+                                if (isset($restriction['attribs']['']['relationship'])) {
+                                    $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($restriction['attribs']['']['type'])) {
+                                    $restriction_type = $this->sanitize($restriction['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                if (isset($restriction['data'])) {
+                                    $restriction_value = $this->sanitize($restriction['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                                }
+                                $restrictions[] = $this->registry->create(Restriction::class, [$restriction_relationship, $restriction_type, $restriction_value]);
+                            }
+                            if (is_array($restrictions)) {
+                                $restrictions = array_values(array_unique($restrictions));
+                            }
+                        } else {
+                            $restrictions = $restrictions_parent;
+                        }
+
+                        // THUMBNAILS
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['thumbnail'])) {
+                            foreach ($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail) {
+                                if (isset($thumbnail['attribs']['']['url'])) {
+                                    $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+                                }
+                            }
+                            if (is_array($thumbnails)) {
+                                $thumbnails = array_values(array_unique($thumbnails));
+                            }
+                        } else {
+                            $thumbnails = $thumbnails_parent;
+                        }
+
+                        // TITLES
+                        if (isset($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['title'])) {
+                            $title = $this->sanitize($content['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['title'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                        } else {
+                            $title = $title_parent;
+                        }
+
+                        $this->data['enclosures'][] = $this->registry->create(Enclosure::class, [$url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width]);
+                    }
+                }
+            }
+
+            foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'link') as $link) {
+                if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure') {
+                    // Attributes
+                    $bitrate = null;
+                    $channels = null;
+                    $duration = null;
+                    $expression = null;
+                    $framerate = null;
+                    $height = null;
+                    $javascript = null;
+                    $lang = null;
+                    $length = null;
+                    $medium = null;
+                    $samplingrate = null;
+                    $type = null;
+                    $url = null;
+                    $width = null;
+
+                    $url = $this->sanitize($link['attribs']['']['href'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($link));
+                    if (isset($link['attribs']['']['type'])) {
+                        $type = $this->sanitize($link['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($link['attribs']['']['length'])) {
+                        $length = intval($link['attribs']['']['length']);
+                    }
+                    if (isset($link['attribs']['']['title'])) {
+                        $title = $this->sanitize($link['attribs']['']['title'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    } else {
+                        $title = $title_parent;
+                    }
+
+                    // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+                    $this->data['enclosures'][] = $this->registry->create(Enclosure::class, [$url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title, $width]);
+                }
+            }
+
+            foreach ((array) $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'link') as $link) {
+                if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure') {
+                    // Attributes
+                    $bitrate = null;
+                    $channels = null;
+                    $duration = null;
+                    $expression = null;
+                    $framerate = null;
+                    $height = null;
+                    $javascript = null;
+                    $lang = null;
+                    $length = null;
+                    $medium = null;
+                    $samplingrate = null;
+                    $type = null;
+                    $url = null;
+                    $width = null;
+
+                    $url = $this->sanitize($link['attribs']['']['href'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($link));
+                    if (isset($link['attribs']['']['type'])) {
+                        $type = $this->sanitize($link['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($link['attribs']['']['length'])) {
+                        $length = intval($link['attribs']['']['length']);
+                    }
+
+                    // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+                    $this->data['enclosures'][] = $this->registry->create(Enclosure::class, [$url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width]);
+                }
+            }
+
+            foreach ($this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'enclosure') ?? [] as $enclosure) {
+                if (isset($enclosure['attribs']['']['url'])) {
+                    // Attributes
+                    $bitrate = null;
+                    $channels = null;
+                    $duration = null;
+                    $expression = null;
+                    $framerate = null;
+                    $height = null;
+                    $javascript = null;
+                    $lang = null;
+                    $length = null;
+                    $medium = null;
+                    $samplingrate = null;
+                    $type = null;
+                    $url = null;
+                    $width = null;
+
+                    $url = $this->sanitize($enclosure['attribs']['']['url'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($enclosure));
+                    $url = $this->feed->sanitize->https_url($url);
+                    if (isset($enclosure['attribs']['']['type'])) {
+                        $type = $this->sanitize($enclosure['attribs']['']['type'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+                    }
+                    if (isset($enclosure['attribs']['']['length'])) {
+                        $length = intval($enclosure['attribs']['']['length']);
+                    }
+
+                    // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+                    $this->data['enclosures'][] = $this->registry->create(Enclosure::class, [$url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width]);
+                }
+            }
+
+            if (sizeof($this->data['enclosures']) === 0 && ($url || $type || $length || $bitrate || $captions_parent || $categories_parent || $channels || $copyrights_parent || $credits_parent || $description_parent || $duration_parent || $expression || $framerate || $hashes_parent || $height || $keywords_parent || $lang || $medium || $player_parent || $ratings_parent || $restrictions_parent || $samplingrate || $thumbnails_parent || $title_parent || $width)) {
+                // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+                $this->data['enclosures'][] = $this->registry->create(Enclosure::class, [$url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width]);
+            }
+
+            $this->data['enclosures'] = array_values(array_unique($this->data['enclosures']));
+        }
+        if (!empty($this->data['enclosures'])) {
+            return $this->data['enclosures'];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the latitude coordinates for the item
+     *
+     * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+     *
+     * Uses `<geo:lat>` or `<georss:point>`
+     *
+     * @since 1.0
+     * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+     * @link http://www.georss.org/ GeoRSS
+     * @return string|null
+     */
+    public function get_latitude()
+    {
+        if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_W3C_BASIC_GEO, 'lat')) {
+            return (float) $return[0]['data'];
+        } elseif (($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) {
+            return (float) $match[1];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the longitude coordinates for the item
+     *
+     * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+     *
+     * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>`
+     *
+     * @since 1.0
+     * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+     * @link http://www.georss.org/ GeoRSS
+     * @return string|null
+     */
+    public function get_longitude()
+    {
+        if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_W3C_BASIC_GEO, 'long')) {
+            return (float) $return[0]['data'];
+        } elseif ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_W3C_BASIC_GEO, 'lon')) {
+            return (float) $return[0]['data'];
+        } elseif (($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) {
+            return (float) $match[2];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the `<atom:source>` for the item
+     *
+     * @since 1.1
+     * @return \SimplePie\Source|null
+     */
+    public function get_source()
+    {
+        if ($return = $this->get_item_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'source')) {
+            return $this->registry->create(Source::class, [$this, $return[0]]);
+        }
+
+        return null;
+    }
+}
+
+class_alias('SimplePie\Item', 'SimplePie_Item');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcLocatorphpfromrev59140trunksrcwpincludesSimplePieLocatorphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Locator.php (from rev 59140, trunk/src/wp-includes/SimplePie/Locator.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Locator.php                           (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Locator.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,369 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Used for feed auto-discovery
+ *
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_locator_class()}
+ *
+ * @package SimplePie
+ */
+class Locator implements RegistryAware
+{
+    public $useragent;
+    public $timeout;
+    public $file;
+    public $local = [];
+    public $elsewhere = [];
+    public $cached_entities = [];
+    public $http_base;
+    public $base;
+    public $base_location = 0;
+    public $checked_feeds = 0;
+    public $max_checked_feeds = 10;
+    public $force_fsockopen = false;
+    public $curl_options = [];
+    public $dom;
+    protected $registry;
+
+    public function __construct(\SimplePie\File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10, $force_fsockopen = false, $curl_options = [])
+    {
+        $this->file = $file;
+        $this->useragent = $useragent;
+        $this->timeout = $timeout;
+        $this->max_checked_feeds = $max_checked_feeds;
+        $this->force_fsockopen = $force_fsockopen;
+        $this->curl_options = $curl_options;
+
+        if (class_exists('DOMDocument') && $this->file->body != '') {
+            $this->dom = new \DOMDocument();
+
+            set_error_handler(['SimplePie\Misc', 'silence_errors']);
+            try {
+                $this->dom->loadHTML($this->file->body);
+            } catch (\Throwable $ex) {
+                $this->dom = null;
+            }
+            restore_error_handler();
+        } else {
+            $this->dom = null;
+        }
+    }
+
+    public function set_registry(\SimplePie\Registry $registry)/* : void */
+    {
+        $this->registry = $registry;
+    }
+
+    public function find($type = \SimplePie\SimplePie::LOCATOR_ALL, &$working = null)
+    {
+        if ($this->is_feed($this->file)) {
+            return $this->file;
+        }
+
+        if ($this->file->method & \SimplePie\SimplePie::FILE_SOURCE_REMOTE) {
+            $sniffer = $this->registry->create(Content\Type\Sniffer::class, [$this->file]);
+            if ($sniffer->get_type() !== 'text/html') {
+                return null;
+            }
+        }
+
+        if ($type & ~\SimplePie\SimplePie::LOCATOR_NONE) {
+            $this->get_base();
+        }
+
+        if ($type & \SimplePie\SimplePie::LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery()) {
+            return $working[0];
+        }
+
+        if ($type & (\SimplePie\SimplePie::LOCATOR_LOCAL_EXTENSION | \SimplePie\SimplePie::LOCATOR_LOCAL_BODY | \SimplePie\SimplePie::LOCATOR_REMOTE_EXTENSION | \SimplePie\SimplePie::LOCATOR_REMOTE_BODY) && $this->get_links()) {
+            if ($type & \SimplePie\SimplePie::LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local)) {
+                return $working[0];
+            }
+
+            if ($type & \SimplePie\SimplePie::LOCATOR_LOCAL_BODY && $working = $this->body($this->local)) {
+                return $working[0];
+            }
+
+            if ($type & \SimplePie\SimplePie::LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere)) {
+                return $working[0];
+            }
+
+            if ($type & \SimplePie\SimplePie::LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere)) {
+                return $working[0];
+            }
+        }
+        return null;
+    }
+
+    public function is_feed($file, $check_html = false)
+    {
+        if ($file->method & \SimplePie\SimplePie::FILE_SOURCE_REMOTE) {
+            $sniffer = $this->registry->create(Content\Type\Sniffer::class, [$file]);
+            $sniffed = $sniffer->get_type();
+            $mime_types = ['application/rss+xml', 'application/rdf+xml',
+                                'text/rdf', 'application/atom+xml', 'text/xml',
+                                'application/xml', 'application/x-rss+xml'];
+            if ($check_html) {
+                $mime_types[] = 'text/html';
+            }
+
+            return in_array($sniffed, $mime_types);
+        } elseif ($file->method & \SimplePie\SimplePie::FILE_SOURCE_LOCAL) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function get_base()
+    {
+        if ($this->dom === null) {
+            throw new \SimplePie\Exception('DOMDocument not found, unable to use locator');
+        }
+        $this->http_base = $this->file->url;
+        $this->base = $this->http_base;
+        $elements = $this->dom->getElementsByTagName('base');
+        foreach ($elements as $element) {
+            if ($element->hasAttribute('href')) {
+                $base = $this->registry->call(Misc::class, 'absolutize_url', [trim($element->getAttribute('href')), $this->http_base]);
+                if ($base === false) {
+                    continue;
+                }
+                $this->base = $base;
+                $this->base_location = method_exists($element, 'getLineNo') ? $element->getLineNo() : 0;
+                break;
+            }
+        }
+    }
+
+    public function autodiscovery()
+    {
+        $done = [];
+        $feeds = [];
+        $feeds = array_merge($feeds, $this->search_elements_by_tag('link', $done, $feeds));
+        $feeds = array_merge($feeds, $this->search_elements_by_tag('a', $done, $feeds));
+        $feeds = array_merge($feeds, $this->search_elements_by_tag('area', $done, $feeds));
+
+        if (!empty($feeds)) {
+            return array_values($feeds);
+        }
+
+        return null;
+    }
+
+    protected function search_elements_by_tag($name, &$done, $feeds)
+    {
+        if ($this->dom === null) {
+            throw new \SimplePie\Exception('DOMDocument not found, unable to use locator');
+        }
+
+        $links = $this->dom->getElementsByTagName($name);
+        foreach ($links as $link) {
+            if ($this->checked_feeds === $this->max_checked_feeds) {
+                break;
+            }
+            if ($link->hasAttribute('href') && $link->hasAttribute('rel')) {
+                $rel = array_unique($this->registry->call(Misc::class, 'space_separated_tokens', [strtolower($link->getAttribute('rel'))]));
+                $line = method_exists($link, 'getLineNo') ? $link->getLineNo() : 1;
+
+                if ($this->base_location < $line) {
+                    $href = $this->registry->call(Misc::class, 'absolutize_url', [trim($link->getAttribute('href')), $this->base]);
+                } else {
+                    $href = $this->registry->call(Misc::class, 'absolutize_url', [trim($link->getAttribute('href')), $this->http_base]);
+                }
+                if ($href === false) {
+                    continue;
+                }
+
+                if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !in_array('stylesheet', $rel) && $link->hasAttribute('type') && in_array(strtolower($this->registry->call(Misc::class, 'parse_mime', [$link->getAttribute('type')])), ['text/html', 'application/rss+xml', 'application/atom+xml'])) && !isset($feeds[$href])) {
+                    $this->checked_feeds++;
+                    $headers = [
+                        'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+                    ];
+                    $feed = $this->registry->create(File::class, [$href, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options]);
+                    if ($feed->success && ($feed->method & \SimplePie\SimplePie::FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed, true)) {
+                        $feeds[$href] = $feed;
+                    }
+                }
+                $done[] = $href;
+            }
+        }
+
+        return $feeds;
+    }
+
+    public function get_links()
+    {
+        if ($this->dom === null) {
+            throw new \SimplePie\Exception('DOMDocument not found, unable to use locator');
+        }
+
+        $links = $this->dom->getElementsByTagName('a');
+        foreach ($links as $link) {
+            if ($link->hasAttribute('href')) {
+                $href = trim($link->getAttribute('href'));
+                $parsed = $this->registry->call(Misc::class, 'parse_url', [$href]);
+                if ($parsed['scheme'] === '' || preg_match('/^(https?|feed)?$/i', $parsed['scheme'])) {
+                    if (method_exists($link, 'getLineNo') && $this->base_location < $link->getLineNo()) {
+                        $href = $this->registry->call(Misc::class, 'absolutize_url', [trim($link->getAttribute('href')), $this->base]);
+                    } else {
+                        $href = $this->registry->call(Misc::class, 'absolutize_url', [trim($link->getAttribute('href')), $this->http_base]);
+                    }
+                    if ($href === false) {
+                        continue;
+                    }
+
+                    $current = $this->registry->call(Misc::class, 'parse_url', [$this->file->url]);
+
+                    if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority']) {
+                        $this->local[] = $href;
+                    } else {
+                        $this->elsewhere[] = $href;
+                    }
+                }
+            }
+        }
+        $this->local = array_unique($this->local);
+        $this->elsewhere = array_unique($this->elsewhere);
+        if (!empty($this->local) || !empty($this->elsewhere)) {
+            return true;
+        }
+        return null;
+    }
+
+    public function get_rel_link($rel)
+    {
+        if ($this->dom === null) {
+            throw new \SimplePie\Exception('DOMDocument not found, unable to use '.
+                                          'locator');
+        }
+        if (!class_exists('DOMXpath')) {
+            throw new \SimplePie\Exception('DOMXpath not found, unable to use '.
+                                          'get_rel_link');
+        }
+
+        $xpath = new \DOMXpath($this->dom);
+        $query = '//a[@rel and @href] | //link[@rel and @href]';
+        foreach ($xpath->query($query) as $link) {
+            $href = trim($link->getAttribute('href'));
+            $parsed = $this->registry->call(Misc::class, 'parse_url', [$href]);
+            if ($parsed['scheme'] === '' ||
+                preg_match('/^https?$/i', $parsed['scheme'])) {
+                if (method_exists($link, 'getLineNo') &&
+                    $this->base_location < $link->getLineNo()) {
+                    $href = $this->registry->call(
+                        Misc::class,
+                        'absolutize_url',
+                        [trim($link->getAttribute('href')), $this->base]
+                    );
+                } else {
+                    $href = $this->registry->call(
+                        Misc::class,
+                        'absolutize_url',
+                        [trim($link->getAttribute('href')), $this->http_base]
+                    );
+                }
+                if ($href === false) {
+                    return null;
+                }
+                $rel_values = explode(' ', strtolower($link->getAttribute('rel')));
+                if (in_array($rel, $rel_values)) {
+                    return $href;
+                }
+            }
+        }
+        return null;
+    }
+
+    public function extension(&$array)
+    {
+        foreach ($array as $key => $value) {
+            if ($this->checked_feeds === $this->max_checked_feeds) {
+                break;
+            }
+            if (in_array(strtolower(strrchr($value, '.')), ['.rss', '.rdf', '.atom', '.xml'])) {
+                $this->checked_feeds++;
+
+                $headers = [
+                    'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+                ];
+                $feed = $this->registry->create(File::class, [$value, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options]);
+                if ($feed->success && ($feed->method & \SimplePie\SimplePie::FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) {
+                    return [$feed];
+                } else {
+                    unset($array[$key]);
+                }
+            }
+        }
+        return null;
+    }
+
+    public function body(&$array)
+    {
+        foreach ($array as $key => $value) {
+            if ($this->checked_feeds === $this->max_checked_feeds) {
+                break;
+            }
+            if (preg_match('/(feed|rss|rdf|atom|xml)/i', $value)) {
+                $this->checked_feeds++;
+                $headers = [
+                    'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+                ];
+                $feed = $this->registry->create(File::class, [$value, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen, $this->curl_options]);
+                if ($feed->success && ($feed->method & \SimplePie\SimplePie::FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) {
+                    return [$feed];
+                } else {
+                    unset($array[$key]);
+                }
+            }
+        }
+        return null;
+    }
+}
+
+class_alias('SimplePie\Locator', 'SimplePie_Locator', false);
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcMiscphpfromrev59140trunksrcwpincludesSimplePieMiscphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Misc.php (from rev 59140, trunk/src/wp-includes/SimplePie/Misc.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Misc.php                              (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Misc.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,2179 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+use SimplePie\XML\Declaration\Parser;
+
+/**
+ * Miscellaneous utilities
+ *
+ * @package SimplePie
+ */
+class Misc
+{
+    private static $SIMPLEPIE_BUILD = null;
+
+    public static function time_hms($seconds)
+    {
+        $time = '';
+
+        $hours = floor($seconds / 3600);
+        $remainder = $seconds % 3600;
+        if ($hours > 0) {
+            $time .= $hours.':';
+        }
+
+        $minutes = floor($remainder / 60);
+        $seconds = $remainder % 60;
+        if ($minutes < 10 && $hours > 0) {
+            $minutes = '0' . $minutes;
+        }
+        if ($seconds < 10) {
+            $seconds = '0' . $seconds;
+        }
+
+        $time .= $minutes.':';
+        $time .= $seconds;
+
+        return $time;
+    }
+
+    public static function absolutize_url($relative, $base)
+    {
+        $iri = \SimplePie\IRI::absolutize(new \SimplePie\IRI($base), $relative);
+        if ($iri === false) {
+            return false;
+        }
+        return $iri->get_uri();
+    }
+
+    /**
+     * Get a HTML/XML element from a HTML string
+     *
+     * @deprecated since SimplePie 1.3, use DOMDocument instead (parsing HTML with regex is bad!)
+     * @param string $realname Element name (including namespace prefix if applicable)
+     * @param string $string HTML document
+     * @return array
+     */
+    public static function get_element($realname, $string)
+    {
+        // trigger_error(sprintf('Using method "' . __METHOD__ . '" is deprecated since SimplePie 1.3, use "DOMDocument" instead.'), \E_USER_DEPRECATED);
+
+        $return = [];
+        $name = preg_quote($realname, '/');
+        if (preg_match_all("/<($name)" . \SimplePie\SimplePie::PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+            for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++) {
+                $return[$i]['tag'] = $realname;
+                $return[$i]['full'] = $matches[$i][0][0];
+                $return[$i]['offset'] = $matches[$i][0][1];
+                if (strlen($matches[$i][3][0]) <= 2) {
+                    $return[$i]['self_closing'] = true;
+                } else {
+                    $return[$i]['self_closing'] = false;
+                    $return[$i]['content'] = $matches[$i][4][0];
+                }
+                $return[$i]['attribs'] = [];
+                if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER)) {
+                    for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++) {
+                        if (count($attribs[$j]) === 2) {
+                            $attribs[$j][2] = $attribs[$j][1];
+                        }
+                        $return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = Misc::entities_decode(end($attribs[$j]));
+                    }
+                }
+            }
+        }
+        return $return;
+    }
+
+    public static function element_implode($element)
+    {
+        $full = "<$element[tag]";
+        foreach ($element['attribs'] as $key => $value) {
+            $key = strtolower($key);
+            $full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
+        }
+        if ($element['self_closing']) {
+            $full .= ' />';
+        } else {
+            $full .= ">$element[content]</$element[tag]>";
+        }
+        return $full;
+    }
+
+    public static function error($message, $level, $file, $line)
+    {
+        if ((error_reporting() & $level) > 0) {
+            switch ($level) {
+                case E_USER_ERROR:
+                    $note = 'PHP Error';
+                    break;
+                case E_USER_WARNING:
+                    $note = 'PHP Warning';
+                    break;
+                case E_USER_NOTICE:
+                    $note = 'PHP Notice';
+                    break;
+                default:
+                    $note = 'Unknown Error';
+                    break;
+            }
+
+            $log_error = true;
+            if (!function_exists('error_log')) {
+                $log_error = false;
+            }
+
+            $log_file = @ini_get('error_log');
+            if (!empty($log_file) && ('syslog' !== $log_file) && !@is_writable($log_file)) {
+                $log_error = false;
+            }
+
+            if ($log_error) {
+                @error_log("$note: $message in $file on line $line", 0);
+            }
+        }
+
+        return $message;
+    }
+
+    public static function fix_protocol($url, $http = 1)
+    {
+        $url = Misc::normalize_url($url);
+        $parsed = Misc::parse_url($url);
+        if ($parsed['scheme'] !== '' && $parsed['scheme'] !== 'http' && $parsed['scheme'] !== 'https') {
+            return Misc::fix_protocol(Misc::compress_parse_url('http', $parsed['authority'], $parsed['path'], $parsed['query'], $parsed['fragment']), $http);
+        }
+
+        if ($parsed['scheme'] === '' && $parsed['authority'] === '' && !file_exists($url)) {
+            return Misc::fix_protocol(Misc::compress_parse_url('http', $parsed['path'], '', $parsed['query'], $parsed['fragment']), $http);
+        }
+
+        if ($http === 2 && $parsed['scheme'] !== '') {
+            return "feed:$url";
+        } elseif ($http === 3 && strtolower($parsed['scheme']) === 'http') {
+            return substr_replace($url, 'podcast', 0, 4);
+        } elseif ($http === 4 && strtolower($parsed['scheme']) === 'http') {
+            return substr_replace($url, 'itpc', 0, 4);
+        }
+
+        return $url;
+    }
+
+    /**
+     * @deprecated since SimplePie 1.8.0, use PHP native array_replace_recursive() instead.
+     */
+    public static function array_merge_recursive($array1, $array2)
+    {
+        foreach ($array2 as $key => $value) {
+            if (is_array($value)) {
+                $array1[$key] = Misc::array_merge_recursive($array1[$key], $value);
+            } else {
+                $array1[$key] = $value;
+            }
+        }
+
+        return $array1;
+    }
+
+    public static function parse_url($url)
+    {
+        $iri = new \SimplePie\IRI($url);
+        return [
+            'scheme' => (string) $iri->scheme,
+            'authority' => (string) $iri->authority,
+            'path' => (string) $iri->path,
+            'query' => (string) $iri->query,
+            'fragment' => (string) $iri->fragment
+        ];
+    }
+
+    public static function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '')
+    {
+        $iri = new \SimplePie\IRI('');
+        $iri->scheme = $scheme;
+        $iri->authority = $authority;
+        $iri->path = $path;
+        $iri->query = $query;
+        $iri->fragment = $fragment;
+        return $iri->get_uri();
+    }
+
+    public static function normalize_url($url)
+    {
+        $iri = new \SimplePie\IRI($url);
+        return $iri->get_uri();
+    }
+
+    public static function percent_encoding_normalization($match)
+    {
+        $integer = hexdec($match[1]);
+        if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E) {
+            return chr($integer);
+        }
+
+        return strtoupper($match[0]);
+    }
+
+    /**
+     * Converts a Windows-1252 encoded string to a UTF-8 encoded string
+     *
+     * @static
+     * @param string $string Windows-1252 encoded string
+     * @return string UTF-8 encoded string
+     */
+    public static function windows_1252_to_utf8($string)
+    {
+        static $convert_table = ["\x80" => "\xE2\x82\xAC", "\x81" => "\xEF\xBF\xBD", "\x82" => "\xE2\x80\x9A", "\x83" => "\xC6\x92", "\x84" => "\xE2\x80\x9E", "\x85" => "\xE2\x80\xA6", "\x86" => "\xE2\x80\xA0", "\x87" => "\xE2\x80\xA1", "\x88" => "\xCB\x86", "\x89" => "\xE2\x80\xB0", "\x8A" => "\xC5\xA0", "\x8B" => "\xE2\x80\xB9", "\x8C" => "\xC5\x92", "\x8D" => "\xEF\xBF\xBD", "\x8E" => "\xC5\xBD", "\x8F" => "\xEF\xBF\xBD", "\x90" => "\xEF\xBF\xBD", "\x91" => "\xE2\x80\x98", "\x92" => "\xE2\x80\x99", "\x93" => "\xE2\x80\x9C", &quo
 t;\x94" => "\xE2\x80\x9D", "\x95" => "\xE2\x80\xA2", "\x96" => "\xE2\x80\x93", "\x97" => "\xE2\x80\x94", "\x98" => "\xCB\x9C", "\x99" => "\xE2\x84\xA2", "\x9A" => "\xC5\xA1", "\x9B" => "\xE2\x80\xBA", "\x9C" => "\xC5\x93", "\x9D" => "\xEF\xBF\xBD", "\x9E" => "\xC5\xBE", "\x9F" => "\xC5\xB8", "\xA0" => "\xC2\xA0", "\xA1" => "\xC2\xA1", "\xA2" => "\xC2\xA2", "\xA3" => "\xC2\xA3", "\xA4" => "\xC2\xA4", "\xA5" => "\xC2\xA5", "\xA6" => "\xC2\xA6", "\xA7" => "\xC2\xA7", "\xA8" => "\xC2\xA8", "\xA9" => &quot
 ;\xC2\xA9", "\xAA" => "\xC2\xAA", "\xAB" => "\xC2\xAB", "\xAC" => "\xC2\xAC", "\xAD" => "\xC2\xAD", "\xAE" => "\xC2\xAE", "\xAF" => "\xC2\xAF", "\xB0" => "\xC2\xB0", "\xB1" => "\xC2\xB1", "\xB2" => "\xC2\xB2", "\xB3" => "\xC2\xB3", "\xB4" => "\xC2\xB4", "\xB5" => "\xC2\xB5", "\xB6" => "\xC2\xB6", "\xB7" => "\xC2\xB7", "\xB8" => "\xC2\xB8", "\xB9" => "\xC2\xB9", "\xBA" => "\xC2\xBA", "\xBB" => "\xC2\xBB", "\xBC" => "\xC2\xBC", "\xBD" => "\xC2\xBD", "\xBE" => "\xC2\xBE", "\xBF" => "\xC2\x
 BF", "\xC0" => "\xC3\x80", "\xC1" => "\xC3\x81", "\xC2" => "\xC3\x82", "\xC3" => "\xC3\x83", "\xC4" => "\xC3\x84", "\xC5" => "\xC3\x85", "\xC6" => "\xC3\x86", "\xC7" => "\xC3\x87", "\xC8" => "\xC3\x88", "\xC9" => "\xC3\x89", "\xCA" => "\xC3\x8A", "\xCB" => "\xC3\x8B", "\xCC" => "\xC3\x8C", "\xCD" => "\xC3\x8D", "\xCE" => "\xC3\x8E", "\xCF" => "\xC3\x8F", "\xD0" => "\xC3\x90", "\xD1" => "\xC3\x91", "\xD2" => "\xC3\x92", "\xD3" => "\xC3\x93", "\xD4" => "\xC3\x94", "\xD5" => "\xC3\x95&quot
 ;, "\xD6" => "\xC3\x96", "\xD7" => "\xC3\x97", "\xD8" => "\xC3\x98", "\xD9" => "\xC3\x99", "\xDA" => "\xC3\x9A", "\xDB" => "\xC3\x9B", "\xDC" => "\xC3\x9C", "\xDD" => "\xC3\x9D", "\xDE" => "\xC3\x9E", "\xDF" => "\xC3\x9F", "\xE0" => "\xC3\xA0", "\xE1" => "\xC3\xA1", "\xE2" => "\xC3\xA2", "\xE3" => "\xC3\xA3", "\xE4" => "\xC3\xA4", "\xE5" => "\xC3\xA5", "\xE6" => "\xC3\xA6", "\xE7" => "\xC3\xA7", "\xE8" => "\xC3\xA8", "\xE9" => "\xC3\xA9", "\xEA" => "\xC3\xAA", "\xEB" => "\xC3\xAB", &quo
 t;\xEC" => "\xC3\xAC", "\xED" => "\xC3\xAD", "\xEE" => "\xC3\xAE", "\xEF" => "\xC3\xAF", "\xF0" => "\xC3\xB0", "\xF1" => "\xC3\xB1", "\xF2" => "\xC3\xB2", "\xF3" => "\xC3\xB3", "\xF4" => "\xC3\xB4", "\xF5" => "\xC3\xB5", "\xF6" => "\xC3\xB6", "\xF7" => "\xC3\xB7", "\xF8" => "\xC3\xB8", "\xF9" => "\xC3\xB9", "\xFA" => "\xC3\xBA", "\xFB" => "\xC3\xBB", "\xFC" => "\xC3\xBC", "\xFD" => "\xC3\xBD", "\xFE" => "\xC3\xBE", "\xFF" => "\xC3\xBF"];
+
+        return strtr($string, $convert_table);
+    }
+
+    /**
+     * Change a string from one encoding to another
+     *
+     * @param string $data Raw data in $input encoding
+     * @param string $input Encoding of $data
+     * @param string $output Encoding you want
+     * @return string|boolean False if we can't convert it
+     */
+    public static function change_encoding($data, $input, $output)
+    {
+        $input = Misc::encoding($input);
+        $output = Misc::encoding($output);
+
+        // We fail to fail on non US-ASCII bytes
+        if ($input === 'US-ASCII') {
+            static $non_ascii_octects = '';
+            if (!$non_ascii_octects) {
+                for ($i = 0x80; $i <= 0xFF; $i++) {
+                    $non_ascii_octects .= chr($i);
+                }
+            }
+            $data = substr($data, 0, strcspn($data, $non_ascii_octects));
+        }
+
+        // This is first, as behaviour of this is completely predictable
+        if ($input === 'windows-1252' && $output === 'UTF-8') {
+            return Misc::windows_1252_to_utf8($data);
+        }
+        // This is second, as behaviour of this varies only with PHP version (the middle part of this expression checks the encoding is supported).
+        elseif (function_exists('mb_convert_encoding') && ($return = Misc::change_encoding_mbstring($data, $input, $output))) {
+            return $return;
+        }
+        // This is third, as behaviour of this varies with OS userland and PHP version
+        elseif (function_exists('iconv') && ($return = Misc::change_encoding_iconv($data, $input, $output))) {
+            return $return;
+        }
+        // This is last, as behaviour of this varies with OS userland and PHP version
+        elseif (class_exists('\UConverter') && ($return = Misc::change_encoding_uconverter($data, $input, $output))) {
+            return $return;
+        }
+
+        // If we can't do anything, just fail
+        return false;
+    }
+
+    protected static function change_encoding_mbstring($data, $input, $output)
+    {
+        if ($input === 'windows-949') {
+            $input = 'EUC-KR';
+        }
+        if ($output === 'windows-949') {
+            $output = 'EUC-KR';
+        }
+        if ($input === 'Windows-31J') {
+            $input = 'SJIS';
+        }
+        if ($output === 'Windows-31J') {
+            $output = 'SJIS';
+        }
+
+        // Check that the encoding is supported
+        if (!in_array($input, mb_list_encodings())) {
+            return false;
+        }
+
+        if (@mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80") {
+            return false;
+        }
+
+        // Let's do some conversion
+        if ($return = @mb_convert_encoding($data, $output, $input)) {
+            return $return;
+        }
+
+        return false;
+    }
+
+    protected static function change_encoding_iconv($data, $input, $output)
+    {
+        return @iconv($input, $output, $data);
+    }
+
+    /**
+     * @param string $data
+     * @param string $input
+     * @param string $output
+     * @return string|false
+     */
+    protected static function change_encoding_uconverter($data, $input, $output)
+    {
+        return @\UConverter::transcode($data, $output, $input);
+    }
+
+    /**
+     * Normalize an encoding name
+     *
+     * This is automatically generated by create.php
+     *
+     * To generate it, run `php create.php` on the command line, and copy the
+     * output to replace this function.
+     *
+     * @param string $charset Character set to standardise
+     * @return string Standardised name
+     */
+    public static function encoding($charset)
+    {
+        // Normalization from UTS #22
+        switch (strtolower(preg_replace('/(?:[^a-zA-Z0-9]+|([^0-9])0+)/', '\1', $charset))) {
+            case 'adobestandardencoding':
+            case 'csadobestandardencoding':
+                return 'Adobe-Standard-Encoding';
+
+            case 'adobesymbolencoding':
+            case 'cshppsmath':
+                return 'Adobe-Symbol-Encoding';
+
+            case 'ami1251':
+            case 'amiga1251':
+                return 'Amiga-1251';
+
+            case 'ansix31101983':
+            case 'csat5001983':
+            case 'csiso99naplps':
+            case 'isoir99':
+            case 'naplps':
+                return 'ANSI_X3.110-1983';
+
+            case 'arabic7':
+            case 'asmo449':
+            case 'csiso89asmo449':
+            case 'iso9036':
+            case 'isoir89':
+                return 'ASMO_449';
+
+            case 'big5':
+            case 'csbig5':
+                return 'Big5';
+
+            case 'big5hkscs':
+                return 'Big5-HKSCS';
+
+            case 'bocu1':
+            case 'csbocu1':
+                return 'BOCU-1';
+
+            case 'brf':
+            case 'csbrf':
+                return 'BRF';
+
+            case 'bs4730':
+            case 'csiso4unitedkingdom':
+            case 'gb':
+            case 'iso646gb':
+            case 'isoir4':
+            case 'uk':
+                return 'BS_4730';
+
+            case 'bsviewdata':
+            case 'csiso47bsviewdata':
+            case 'isoir47':
+                return 'BS_viewdata';
+
+            case 'cesu8':
+            case 'cscesu8':
+                return 'CESU-8';
+
+            case 'ca':
+            case 'csa71':
+            case 'csaz243419851':
+            case 'csiso121canadian1':
+            case 'iso646ca':
+            case 'isoir121':
+                return 'CSA_Z243.4-1985-1';
+
+            case 'csa72':
+            case 'csaz243419852':
+            case 'csiso122canadian2':
+            case 'iso646ca2':
+            case 'isoir122':
+                return 'CSA_Z243.4-1985-2';
+
+            case 'csaz24341985gr':
+            case 'csiso123csaz24341985gr':
+            case 'isoir123':
+                return 'CSA_Z243.4-1985-gr';
+
+            case 'csiso139csn369103':
+            case 'csn369103':
+            case 'isoir139':
+                return 'CSN_369103';
+
+            case 'csdecmcs':
+            case 'dec':
+            case 'decmcs':
+                return 'DEC-MCS';
+
+            case 'csiso21german':
+            case 'de':
+            case 'din66003':
+            case 'iso646de':
+            case 'isoir21':
+                return 'DIN_66003';
+
+            case 'csdkus':
+            case 'dkus':
+                return 'dk-us';
+
+            case 'csiso646danish':
+            case 'dk':
+            case 'ds2089':
+            case 'iso646dk':
+                return 'DS_2089';
+
+            case 'csibmebcdicatde':
+            case 'ebcdicatde':
+                return 'EBCDIC-AT-DE';
+
+            case 'csebcdicatdea':
+            case 'ebcdicatdea':
+                return 'EBCDIC-AT-DE-A';
+
+            case 'csebcdiccafr':
+            case 'ebcdiccafr':
+                return 'EBCDIC-CA-FR';
+
+            case 'csebcdicdkno':
+            case 'ebcdicdkno':
+                return 'EBCDIC-DK-NO';
+
+            case 'csebcdicdknoa':
+            case 'ebcdicdknoa':
+                return 'EBCDIC-DK-NO-A';
+
+            case 'csebcdices':
+            case 'ebcdices':
+                return 'EBCDIC-ES';
+
+            case 'csebcdicesa':
+            case 'ebcdicesa':
+                return 'EBCDIC-ES-A';
+
+            case 'csebcdicess':
+            case 'ebcdicess':
+                return 'EBCDIC-ES-S';
+
+            case 'csebcdicfise':
+            case 'ebcdicfise':
+                return 'EBCDIC-FI-SE';
+
+            case 'csebcdicfisea':
+            case 'ebcdicfisea':
+                return 'EBCDIC-FI-SE-A';
+
+            case 'csebcdicfr':
+            case 'ebcdicfr':
+                return 'EBCDIC-FR';
+
+            case 'csebcdicit':
+            case 'ebcdicit':
+                return 'EBCDIC-IT';
+
+            case 'csebcdicpt':
+            case 'ebcdicpt':
+                return 'EBCDIC-PT';
+
+            case 'csebcdicuk':
+            case 'ebcdicuk':
+                return 'EBCDIC-UK';
+
+            case 'csebcdicus':
+            case 'ebcdicus':
+                return 'EBCDIC-US';
+
+            case 'csiso111ecmacyrillic':
+            case 'ecmacyrillic':
+            case 'isoir111':
+            case 'koi8e':
+                return 'ECMA-cyrillic';
+
+            case 'csiso17spanish':
+            case 'es':
+            case 'iso646es':
+            case 'isoir17':
+                return 'ES';
+
+            case 'csiso85spanish2':
+            case 'es2':
+            case 'iso646es2':
+            case 'isoir85':
+                return 'ES2';
+
+            case 'cseucpkdfmtjapanese':
+            case 'eucjp':
+            case 'extendedunixcodepackedformatforjapanese':
+                return 'EUC-JP';
+
+            case 'cseucfixwidjapanese':
+            case 'extendedunixcodefixedwidthforjapanese':
+                return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
+
+            case 'gb18030':
+                return 'GB18030';
+
+            case 'chinese':
+            case 'cp936':
+            case 'csgb2312':
+            case 'csiso58gb231280':
+            case 'gb2312':
+            case 'gb231280':
+            case 'gbk':
+            case 'isoir58':
+            case 'ms936':
+            case 'windows936':
+                return 'GBK';
+
+            case 'cn':
+            case 'csiso57gb1988':
+            case 'gb198880':
+            case 'iso646cn':
+            case 'isoir57':
+                return 'GB_1988-80';
+
+            case 'csiso153gost1976874':
+            case 'gost1976874':
+            case 'isoir153':
+            case 'stsev35888':
+                return 'GOST_19768-74';
+
+            case 'csiso150':
+            case 'csiso150greekccitt':
+            case 'greekccitt':
+            case 'isoir150':
+                return 'greek-ccitt';
+
+            case 'csiso88greek7':
+            case 'greek7':
+            case 'isoir88':
+                return 'greek7';
+
+            case 'csiso18greek7old':
+            case 'greek7old':
+            case 'isoir18':
+                return 'greek7-old';
+
+            case 'cshpdesktop':
+            case 'hpdesktop':
+                return 'HP-DeskTop';
+
+            case 'cshplegal':
+            case 'hplegal':
+                return 'HP-Legal';
+
+            case 'cshpmath8':
+            case 'hpmath8':
+                return 'HP-Math8';
+
+            case 'cshppifont':
+            case 'hppifont':
+                return 'HP-Pi-font';
+
+            case 'cshproman8':
+            case 'hproman8':
+            case 'r8':
+            case 'roman8':
+                return 'hp-roman8';
+
+            case 'hzgb2312':
+                return 'HZ-GB-2312';
+
+            case 'csibmsymbols':
+            case 'ibmsymbols':
+                return 'IBM-Symbols';
+
+            case 'csibmthai':
+            case 'ibmthai':
+                return 'IBM-Thai';
+
+            case 'cp37':
+            case 'csibm37':
+            case 'ebcdiccpca':
+            case 'ebcdiccpnl':
+            case 'ebcdiccpus':
+            case 'ebcdiccpwt':
+            case 'ibm37':
+                return 'IBM037';
+
+            case 'cp38':
+            case 'csibm38':
+            case 'ebcdicint':
+            case 'ibm38':
+                return 'IBM038';
+
+            case 'cp273':
+            case 'csibm273':
+            case 'ibm273':
+                return 'IBM273';
+
+            case 'cp274':
+            case 'csibm274':
+            case 'ebcdicbe':
+            case 'ibm274':
+                return 'IBM274';
+
+            case 'cp275':
+            case 'csibm275':
+            case 'ebcdicbr':
+            case 'ibm275':
+                return 'IBM275';
+
+            case 'csibm277':
+            case 'ebcdiccpdk':
+            case 'ebcdiccpno':
+            case 'ibm277':
+                return 'IBM277';
+
+            case 'cp278':
+            case 'csibm278':
+            case 'ebcdiccpfi':
+            case 'ebcdiccpse':
+            case 'ibm278':
+                return 'IBM278';
+
+            case 'cp280':
+            case 'csibm280':
+            case 'ebcdiccpit':
+            case 'ibm280':
+                return 'IBM280';
+
+            case 'cp281':
+            case 'csibm281':
+            case 'ebcdicjpe':
+            case 'ibm281':
+                return 'IBM281';
+
+            case 'cp284':
+            case 'csibm284':
+            case 'ebcdiccpes':
+            case 'ibm284':
+                return 'IBM284';
+
+            case 'cp285':
+            case 'csibm285':
+            case 'ebcdiccpgb':
+            case 'ibm285':
+                return 'IBM285';
+
+            case 'cp290':
+            case 'csibm290':
+            case 'ebcdicjpkana':
+            case 'ibm290':
+                return 'IBM290';
+
+            case 'cp297':
+            case 'csibm297':
+            case 'ebcdiccpfr':
+            case 'ibm297':
+                return 'IBM297';
+
+            case 'cp420':
+            case 'csibm420':
+            case 'ebcdiccpar1':
+            case 'ibm420':
+                return 'IBM420';
+
+            case 'cp423':
+            case 'csibm423':
+            case 'ebcdiccpgr':
+            case 'ibm423':
+                return 'IBM423';
+
+            case 'cp424':
+            case 'csibm424':
+            case 'ebcdiccphe':
+            case 'ibm424':
+                return 'IBM424';
+
+            case '437':
+            case 'cp437':
+            case 'cspc8codepage437':
+            case 'ibm437':
+                return 'IBM437';
+
+            case 'cp500':
+            case 'csibm500':
+            case 'ebcdiccpbe':
+            case 'ebcdiccpch':
+            case 'ibm500':
+                return 'IBM500';
+
+            case 'cp775':
+            case 'cspc775baltic':
+            case 'ibm775':
+                return 'IBM775';
+
+            case '850':
+            case 'cp850':
+            case 'cspc850multilingual':
+            case 'ibm850':
+                return 'IBM850';
+
+            case '851':
+            case 'cp851':
+            case 'csibm851':
+            case 'ibm851':
+                return 'IBM851';
+
+            case '852':
+            case 'cp852':
+            case 'cspcp852':
+            case 'ibm852':
+                return 'IBM852';
+
+            case '855':
+            case 'cp855':
+            case 'csibm855':
+            case 'ibm855':
+                return 'IBM855';
+
+            case '857':
+            case 'cp857':
+            case 'csibm857':
+            case 'ibm857':
+                return 'IBM857';
+
+            case 'ccsid858':
+            case 'cp858':
+            case 'ibm858':
+            case 'pcmultilingual850euro':
+                return 'IBM00858';
+
+            case '860':
+            case 'cp860':
+            case 'csibm860':
+            case 'ibm860':
+                return 'IBM860';
+
+            case '861':
+            case 'cp861':
+            case 'cpis':
+            case 'csibm861':
+            case 'ibm861':
+                return 'IBM861';
+
+            case '862':
+            case 'cp862':
+            case 'cspc862latinhebrew':
+            case 'ibm862':
+                return 'IBM862';
+
+            case '863':
+            case 'cp863':
+            case 'csibm863':
+            case 'ibm863':
+                return 'IBM863';
+
+            case 'cp864':
+            case 'csibm864':
+            case 'ibm864':
+                return 'IBM864';
+
+            case '865':
+            case 'cp865':
+            case 'csibm865':
+            case 'ibm865':
+                return 'IBM865';
+
+            case '866':
+            case 'cp866':
+            case 'csibm866':
+            case 'ibm866':
+                return 'IBM866';
+
+            case 'cp868':
+            case 'cpar':
+            case 'csibm868':
+            case 'ibm868':
+                return 'IBM868';
+
+            case '869':
+            case 'cp869':
+            case 'cpgr':
+            case 'csibm869':
+            case 'ibm869':
+                return 'IBM869';
+
+            case 'cp870':
+            case 'csibm870':
+            case 'ebcdiccproece':
+            case 'ebcdiccpyu':
+            case 'ibm870':
+                return 'IBM870';
+
+            case 'cp871':
+            case 'csibm871':
+            case 'ebcdiccpis':
+            case 'ibm871':
+                return 'IBM871';
+
+            case 'cp880':
+            case 'csibm880':
+            case 'ebcdiccyrillic':
+            case 'ibm880':
+                return 'IBM880';
+
+            case 'cp891':
+            case 'csibm891':
+            case 'ibm891':
+                return 'IBM891';
+
+            case 'cp903':
+            case 'csibm903':
+            case 'ibm903':
+                return 'IBM903';
+
+            case '904':
+            case 'cp904':
+            case 'csibbm904':
+            case 'ibm904':
+                return 'IBM904';
+
+            case 'cp905':
+            case 'csibm905':
+            case 'ebcdiccptr':
+            case 'ibm905':
+                return 'IBM905';
+
+            case 'cp918':
+            case 'csibm918':
+            case 'ebcdiccpar2':
+            case 'ibm918':
+                return 'IBM918';
+
+            case 'ccsid924':
+            case 'cp924':
+            case 'ebcdiclatin9euro':
+            case 'ibm924':
+                return 'IBM00924';
+
+            case 'cp1026':
+            case 'csibm1026':
+            case 'ibm1026':
+                return 'IBM1026';
+
+            case 'ibm1047':
+                return 'IBM1047';
+
+            case 'ccsid1140':
+            case 'cp1140':
+            case 'ebcdicus37euro':
+            case 'ibm1140':
+                return 'IBM01140';
+
+            case 'ccsid1141':
+            case 'cp1141':
+            case 'ebcdicde273euro':
+            case 'ibm1141':
+                return 'IBM01141';
+
+            case 'ccsid1142':
+            case 'cp1142':
+            case 'ebcdicdk277euro':
+            case 'ebcdicno277euro':
+            case 'ibm1142':
+                return 'IBM01142';
+
+            case 'ccsid1143':
+            case 'cp1143':
+            case 'ebcdicfi278euro':
+            case 'ebcdicse278euro':
+            case 'ibm1143':
+                return 'IBM01143';
+
+            case 'ccsid1144':
+            case 'cp1144':
+            case 'ebcdicit280euro':
+            case 'ibm1144':
+                return 'IBM01144';
+
+            case 'ccsid1145':
+            case 'cp1145':
+            case 'ebcdices284euro':
+            case 'ibm1145':
+                return 'IBM01145';
+
+            case 'ccsid1146':
+            case 'cp1146':
+            case 'ebcdicgb285euro':
+            case 'ibm1146':
+                return 'IBM01146';
+
+            case 'ccsid1147':
+            case 'cp1147':
+            case 'ebcdicfr297euro':
+            case 'ibm1147':
+                return 'IBM01147';
+
+            case 'ccsid1148':
+            case 'cp1148':
+            case 'ebcdicinternational500euro':
+            case 'ibm1148':
+                return 'IBM01148';
+
+            case 'ccsid1149':
+            case 'cp1149':
+            case 'ebcdicis871euro':
+            case 'ibm1149':
+                return 'IBM01149';
+
+            case 'csiso143iecp271':
+            case 'iecp271':
+            case 'isoir143':
+                return 'IEC_P27-1';
+
+            case 'csiso49inis':
+            case 'inis':
+            case 'isoir49':
+                return 'INIS';
+
+            case 'csiso50inis8':
+            case 'inis8':
+            case 'isoir50':
+                return 'INIS-8';
+
+            case 'csiso51iniscyrillic':
+            case 'iniscyrillic':
+            case 'isoir51':
+                return 'INIS-cyrillic';
+
+            case 'csinvariant':
+            case 'invariant':
+                return 'INVARIANT';
+
+            case 'iso2022cn':
+                return 'ISO-2022-CN';
+
+            case 'iso2022cnext':
+                return 'ISO-2022-CN-EXT';
+
+            case 'csiso2022jp':
+            case 'iso2022jp':
+                return 'ISO-2022-JP';
+
+            case 'csiso2022jp2':
+            case 'iso2022jp2':
+                return 'ISO-2022-JP-2';
+
+            case 'csiso2022kr':
+            case 'iso2022kr':
+                return 'ISO-2022-KR';
+
+            case 'cswindows30latin1':
+            case 'iso88591windows30latin1':
+                return 'ISO-8859-1-Windows-3.0-Latin-1';
+
+            case 'cswindows31latin1':
+            case 'iso88591windows31latin1':
+                return 'ISO-8859-1-Windows-3.1-Latin-1';
+
+            case 'csisolatin2':
+            case 'iso88592':
+            case 'iso885921987':
+            case 'isoir101':
+            case 'l2':
+            case 'latin2':
+                return 'ISO-8859-2';
+
+            case 'cswindows31latin2':
+            case 'iso88592windowslatin2':
+                return 'ISO-8859-2-Windows-Latin-2';
+
+            case 'csisolatin3':
+            case 'iso88593':
+            case 'iso885931988':
+            case 'isoir109':
+            case 'l3':
+            case 'latin3':
+                return 'ISO-8859-3';
+
+            case 'csisolatin4':
+            case 'iso88594':
+            case 'iso885941988':
+            case 'isoir110':
+            case 'l4':
+            case 'latin4':
+                return 'ISO-8859-4';
+
+            case 'csisolatincyrillic':
+            case 'cyrillic':
+            case 'iso88595':
+            case 'iso885951988':
+            case 'isoir144':
+                return 'ISO-8859-5';
+
+            case 'arabic':
+            case 'asmo708':
+            case 'csisolatinarabic':
+            case 'ecma114':
+            case 'iso88596':
+            case 'iso885961987':
+            case 'isoir127':
+                return 'ISO-8859-6';
+
+            case 'csiso88596e':
+            case 'iso88596e':
+                return 'ISO-8859-6-E';
+
+            case 'csiso88596i':
+            case 'iso88596i':
+                return 'ISO-8859-6-I';
+
+            case 'csisolatingreek':
+            case 'ecma118':
+            case 'elot928':
+            case 'greek':
+            case 'greek8':
+            case 'iso88597':
+            case 'iso885971987':
+            case 'isoir126':
+                return 'ISO-8859-7';
+
+            case 'csisolatinhebrew':
+            case 'hebrew':
+            case 'iso88598':
+            case 'iso885981988':
+            case 'isoir138':
+                return 'ISO-8859-8';
+
+            case 'csiso88598e':
+            case 'iso88598e':
+                return 'ISO-8859-8-E';
+
+            case 'csiso88598i':
+            case 'iso88598i':
+                return 'ISO-8859-8-I';
+
+            case 'cswindows31latin5':
+            case 'iso88599windowslatin5':
+                return 'ISO-8859-9-Windows-Latin-5';
+
+            case 'csisolatin6':
+            case 'iso885910':
+            case 'iso8859101992':
+            case 'isoir157':
+            case 'l6':
+            case 'latin6':
+                return 'ISO-8859-10';
+
+            case 'iso885913':
+                return 'ISO-8859-13';
+
+            case 'iso885914':
+            case 'iso8859141998':
+            case 'isoceltic':
+            case 'isoir199':
+            case 'l8':
+            case 'latin8':
+                return 'ISO-8859-14';
+
+            case 'iso885915':
+            case 'latin9':
+                return 'ISO-8859-15';
+
+            case 'iso885916':
+            case 'iso8859162001':
+            case 'isoir226':
+            case 'l10':
+            case 'latin10':
+                return 'ISO-8859-16';
+
+            case 'iso10646j1':
+                return 'ISO-10646-J-1';
+
+            case 'csunicode':
+            case 'iso10646ucs2':
+                return 'ISO-10646-UCS-2';
+
+            case 'csucs4':
+            case 'iso10646ucs4':
+                return 'ISO-10646-UCS-4';
+
+            case 'csunicodeascii':
+            case 'iso10646ucsbasic':
+                return 'ISO-10646-UCS-Basic';
+
+            case 'csunicodelatin1':
+            case 'iso10646':
+            case 'iso10646unicodelatin1':
+                return 'ISO-10646-Unicode-Latin1';
+
+            case 'csiso10646utf1':
+            case 'iso10646utf1':
+                return 'ISO-10646-UTF-1';
+
+            case 'csiso115481':
+            case 'iso115481':
+            case 'isotr115481':
+                return 'ISO-11548-1';
+
+            case 'csiso90':
+            case 'isoir90':
+                return 'iso-ir-90';
+
+            case 'csunicodeibm1261':
+            case 'isounicodeibm1261':
+                return 'ISO-Unicode-IBM-1261';
+
+            case 'csunicodeibm1264':
+            case 'isounicodeibm1264':
+                return 'ISO-Unicode-IBM-1264';
+
+            case 'csunicodeibm1265':
+            case 'isounicodeibm1265':
+                return 'ISO-Unicode-IBM-1265';
+
+            case 'csunicodeibm1268':
+            case 'isounicodeibm1268':
+                return 'ISO-Unicode-IBM-1268';
+
+            case 'csunicodeibm1276':
+            case 'isounicodeibm1276':
+                return 'ISO-Unicode-IBM-1276';
+
+            case 'csiso646basic1983':
+            case 'iso646basic1983':
+            case 'ref':
+                return 'ISO_646.basic:1983';
+
+            case 'csiso2intlrefversion':
+            case 'irv':
+            case 'iso646irv1983':
+            case 'isoir2':
+                return 'ISO_646.irv:1983';
+
+            case 'csiso2033':
+            case 'e13b':
+            case 'iso20331983':
+            case 'isoir98':
+                return 'ISO_2033-1983';
+
+            case 'csiso5427cyrillic':
+            case 'iso5427':
+            case 'isoir37':
+                return 'ISO_5427';
+
+            case 'iso5427cyrillic1981':
+            case 'iso54271981':
+            case 'isoir54':
+                return 'ISO_5427:1981';
+
+            case 'csiso5428greek':
+            case 'iso54281980':
+            case 'isoir55':
+                return 'ISO_5428:1980';
+
+            case 'csiso6937add':
+            case 'iso6937225':
+            case 'isoir152':
+                return 'ISO_6937-2-25';
+
+            case 'csisotextcomm':
+            case 'iso69372add':
+            case 'isoir142':
+                return 'ISO_6937-2-add';
+
+            case 'csiso8859supp':
+            case 'iso8859supp':
+            case 'isoir154':
+            case 'latin125':
+                return 'ISO_8859-supp';
+
+            case 'csiso10367box':
+            case 'iso10367box':
+            case 'isoir155':
+                return 'ISO_10367-box';
+
+            case 'csiso15italian':
+            case 'iso646it':
+            case 'isoir15':
+            case 'it':
+                return 'IT';
+
+            case 'csiso13jisc6220jp':
+            case 'isoir13':
+            case 'jisc62201969':
+            case 'jisc62201969jp':
+            case 'katakana':
+            case 'x2017':
+                return 'JIS_C6220-1969-jp';
+
+            case 'csiso14jisc6220ro':
+            case 'iso646jp':
+            case 'isoir14':
+            case 'jisc62201969ro':
+            case 'jp':
+                return 'JIS_C6220-1969-ro';
+
+            case 'csiso42jisc62261978':
+            case 'isoir42':
+            case 'jisc62261978':
+                return 'JIS_C6226-1978';
+
+            case 'csiso87jisx208':
+            case 'isoir87':
+            case 'jisc62261983':
+            case 'jisx2081983':
+            case 'x208':
+                return 'JIS_C6226-1983';
+
+            case 'csiso91jisc62291984a':
+            case 'isoir91':
+            case 'jisc62291984a':
+            case 'jpocra':
+                return 'JIS_C6229-1984-a';
+
+            case 'csiso92jisc62991984b':
+            case 'iso646jpocrb':
+            case 'isoir92':
+            case 'jisc62291984b':
+            case 'jpocrb':
+                return 'JIS_C6229-1984-b';
+
+            case 'csiso93jis62291984badd':
+            case 'isoir93':
+            case 'jisc62291984badd':
+            case 'jpocrbadd':
+                return 'JIS_C6229-1984-b-add';
+
+            case 'csiso94jis62291984hand':
+            case 'isoir94':
+            case 'jisc62291984hand':
+            case 'jpocrhand':
+                return 'JIS_C6229-1984-hand';
+
+            case 'csiso95jis62291984handadd':
+            case 'isoir95':
+            case 'jisc62291984handadd':
+            case 'jpocrhandadd':
+                return 'JIS_C6229-1984-hand-add';
+
+            case 'csiso96jisc62291984kana':
+            case 'isoir96':
+            case 'jisc62291984kana':
+                return 'JIS_C6229-1984-kana';
+
+            case 'csjisencoding':
+            case 'jisencoding':
+                return 'JIS_Encoding';
+
+            case 'cshalfwidthkatakana':
+            case 'jisx201':
+            case 'x201':
+                return 'JIS_X0201';
+
+            case 'csiso159jisx2121990':
+            case 'isoir159':
+            case 'jisx2121990':
+            case 'x212':
+                return 'JIS_X0212-1990';
+
+            case 'csiso141jusib1002':
+            case 'iso646yu':
+            case 'isoir141':
+            case 'js':
+            case 'jusib1002':
+            case 'yu':
+                return 'JUS_I.B1.002';
+
+            case 'csiso147macedonian':
+            case 'isoir147':
+            case 'jusib1003mac':
+            case 'macedonian':
+                return 'JUS_I.B1.003-mac';
+
+            case 'csiso146serbian':
+            case 'isoir146':
+            case 'jusib1003serb':
+            case 'serbian':
+                return 'JUS_I.B1.003-serb';
+
+            case 'koi7switched':
+                return 'KOI7-switched';
+
+            case 'cskoi8r':
+            case 'koi8r':
+                return 'KOI8-R';
+
+            case 'koi8u':
+                return 'KOI8-U';
+
+            case 'csksc5636':
+            case 'iso646kr':
+            case 'ksc5636':
+                return 'KSC5636';
+
+            case 'cskz1048':
+            case 'kz1048':
+            case 'rk1048':
+            case 'strk10482002':
+                return 'KZ-1048';
+
+            case 'csiso19latingreek':
+            case 'isoir19':
+            case 'latingreek':
+                return 'latin-greek';
+
+            case 'csiso27latingreek1':
+            case 'isoir27':
+            case 'latingreek1':
+                return 'Latin-greek-1';
+
+            case 'csiso158lap':
+            case 'isoir158':
+            case 'lap':
+            case 'latinlap':
+                return 'latin-lap';
+
+            case 'csmacintosh':
+            case 'mac':
+            case 'macintosh':
+                return 'macintosh';
+
+            case 'csmicrosoftpublishing':
+            case 'microsoftpublishing':
+                return 'Microsoft-Publishing';
+
+            case 'csmnem':
+            case 'mnem':
+                return 'MNEM';
+
+            case 'csmnemonic':
+            case 'mnemonic':
+                return 'MNEMONIC';
+
+            case 'csiso86hungarian':
+            case 'hu':
+            case 'iso646hu':
+            case 'isoir86':
+            case 'msz77953':
+                return 'MSZ_7795.3';
+
+            case 'csnatsdano':
+            case 'isoir91':
+            case 'natsdano':
+                return 'NATS-DANO';
+
+            case 'csnatsdanoadd':
+            case 'isoir92':
+            case 'natsdanoadd':
+                return 'NATS-DANO-ADD';
+
+            case 'csnatssefi':
+            case 'isoir81':
+            case 'natssefi':
+                return 'NATS-SEFI';
+
+            case 'csnatssefiadd':
+            case 'isoir82':
+            case 'natssefiadd':
+                return 'NATS-SEFI-ADD';
+
+            case 'csiso151cuba':
+            case 'cuba':
+            case 'iso646cu':
+            case 'isoir151':
+            case 'ncnc1081':
+                return 'NC_NC00-10:81';
+
+            case 'csiso69french':
+            case 'fr':
+            case 'iso646fr':
+            case 'isoir69':
+            case 'nfz62010':
+                return 'NF_Z_62-010';
+
+            case 'csiso25french':
+            case 'iso646fr1':
+            case 'isoir25':
+            case 'nfz620101973':
+                return 'NF_Z_62-010_(1973)';
+
+            case 'csiso60danishnorwegian':
+            case 'csiso60norwegian1':
+            case 'iso646no':
+            case 'isoir60':
+            case 'no':
+            case 'ns45511':
+                return 'NS_4551-1';
+
+            case 'csiso61norwegian2':
+            case 'iso646no2':
+            case 'isoir61':
+            case 'no2':
+            case 'ns45512':
+                return 'NS_4551-2';
+
+            case 'osdebcdicdf3irv':
+                return 'OSD_EBCDIC_DF03_IRV';
+
+            case 'osdebcdicdf41':
+                return 'OSD_EBCDIC_DF04_1';
+
+            case 'osdebcdicdf415':
+                return 'OSD_EBCDIC_DF04_15';
+
+            case 'cspc8danishnorwegian':
+            case 'pc8danishnorwegian':
+                return 'PC8-Danish-Norwegian';
+
+            case 'cspc8turkish':
+            case 'pc8turkish':
+                return 'PC8-Turkish';
+
+            case 'csiso16portuguese':
+            case 'iso646pt':
+            case 'isoir16':
+            case 'pt':
+                return 'PT';
+
+            case 'csiso84portuguese2':
+            case 'iso646pt2':
+            case 'isoir84':
+            case 'pt2':
+                return 'PT2';
+
+            case 'cp154':
+            case 'csptcp154':
+            case 'cyrillicasian':
+            case 'pt154':
+            case 'ptcp154':
+                return 'PTCP154';
+
+            case 'scsu':
+                return 'SCSU';
+
+            case 'csiso10swedish':
+            case 'fi':
+            case 'iso646fi':
+            case 'iso646se':
+            case 'isoir10':
+            case 'se':
+            case 'sen850200b':
+                return 'SEN_850200_B';
+
+            case 'csiso11swedishfornames':
+            case 'iso646se2':
+            case 'isoir11':
+            case 'se2':
+            case 'sen850200c':
+                return 'SEN_850200_C';
+
+            case 'csiso102t617bit':
+            case 'isoir102':
+            case 't617bit':
+                return 'T.61-7bit';
+
+            case 'csiso103t618bit':
+            case 'isoir103':
+            case 't61':
+            case 't618bit':
+                return 'T.61-8bit';
+
+            case 'csiso128t101g2':
+            case 'isoir128':
+            case 't101g2':
+                return 'T.101-G2';
+
+            case 'cstscii':
+            case 'tscii':
+                return 'TSCII';
+
+            case 'csunicode11':
+            case 'unicode11':
+                return 'UNICODE-1-1';
+
+            case 'csunicode11utf7':
+            case 'unicode11utf7':
+                return 'UNICODE-1-1-UTF-7';
+
+            case 'csunknown8bit':
+            case 'unknown8bit':
+                return 'UNKNOWN-8BIT';
+
+            case 'ansix341968':
+            case 'ansix341986':
+            case 'ascii':
+            case 'cp367':
+            case 'csascii':
+            case 'ibm367':
+            case 'iso646irv1991':
+            case 'iso646us':
+            case 'isoir6':
+            case 'us':
+            case 'usascii':
+                return 'US-ASCII';
+
+            case 'csusdk':
+            case 'usdk':
+                return 'us-dk';
+
+            case 'utf7':
+                return 'UTF-7';
+
+            case 'utf8':
+                return 'UTF-8';
+
+            case 'utf16':
+                return 'UTF-16';
+
+            case 'utf16be':
+                return 'UTF-16BE';
+
+            case 'utf16le':
+                return 'UTF-16LE';
+
+            case 'utf32':
+                return 'UTF-32';
+
+            case 'utf32be':
+                return 'UTF-32BE';
+
+            case 'utf32le':
+                return 'UTF-32LE';
+
+            case 'csventurainternational':
+            case 'venturainternational':
+                return 'Ventura-International';
+
+            case 'csventuramath':
+            case 'venturamath':
+                return 'Ventura-Math';
+
+            case 'csventuraus':
+            case 'venturaus':
+                return 'Ventura-US';
+
+            case 'csiso70videotexsupp1':
+            case 'isoir70':
+            case 'videotexsuppl':
+                return 'videotex-suppl';
+
+            case 'csviqr':
+            case 'viqr':
+                return 'VIQR';
+
+            case 'csviscii':
+            case 'viscii':
+                return 'VISCII';
+
+            case 'csshiftjis':
+            case 'cswindows31j':
+            case 'mskanji':
+            case 'shiftjis':
+            case 'windows31j':
+                return 'Windows-31J';
+
+            case 'iso885911':
+            case 'tis620':
+                return 'windows-874';
+
+            case 'cseuckr':
+            case 'csksc56011987':
+            case 'euckr':
+            case 'isoir149':
+            case 'korean':
+            case 'ksc5601':
+            case 'ksc56011987':
+            case 'ksc56011989':
+            case 'windows949':
+                return 'windows-949';
+
+            case 'windows1250':
+                return 'windows-1250';
+
+            case 'windows1251':
+                return 'windows-1251';
+
+            case 'cp819':
+            case 'csisolatin1':
+            case 'ibm819':
+            case 'iso88591':
+            case 'iso885911987':
+            case 'isoir100':
+            case 'l1':
+            case 'latin1':
+            case 'windows1252':
+                return 'windows-1252';
+
+            case 'windows1253':
+                return 'windows-1253';
+
+            case 'csisolatin5':
+            case 'iso88599':
+            case 'iso885991989':
+            case 'isoir148':
+            case 'l5':
+            case 'latin5':
+            case 'windows1254':
+                return 'windows-1254';
+
+            case 'windows1255':
+                return 'windows-1255';
+
+            case 'windows1256':
+                return 'windows-1256';
+
+            case 'windows1257':
+                return 'windows-1257';
+
+            case 'windows1258':
+                return 'windows-1258';
+
+            default:
+                return $charset;
+        }
+    }
+
+    public static function get_curl_version()
+    {
+        if (is_array($curl = curl_version())) {
+            $curl = $curl['version'];
+        } elseif (substr($curl, 0, 5) === 'curl/') {
+            $curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
+        } elseif (substr($curl, 0, 8) === 'libcurl/') {
+            $curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
+        } else {
+            $curl = 0;
+        }
+        return $curl;
+    }
+
+    /**
+     * Strip HTML comments
+     *
+     * @param string $data Data to strip comments from
+     * @return string Comment stripped string
+     */
+    public static function strip_comments($data)
+    {
+        $output = '';
+        while (($start = strpos($data, '<!--')) !== false) {
+            $output .= substr($data, 0, $start);
+            if (($end = strpos($data, '-->', $start)) !== false) {
+                $data = substr_replace($data, '', 0, $end + 3);
+            } else {
+                $data = '';
+            }
+        }
+        return $output . $data;
+    }
+
+    public static function parse_date($dt)
+    {
+        $parser = \SimplePie\Parse\Date::get();
+        return $parser->parse($dt);
+    }
+
+    /**
+     * Decode HTML entities
+     *
+     * @deprecated since SimplePie 1.3, use DOMDocument instead
+     * @param string $data Input data
+     * @return string Output data
+     */
+    public static function entities_decode($data)
+    {
+        // trigger_error(sprintf('Using method "' . __METHOD__ . '" is deprecated since SimplePie 1.3, use "DOMDocument" instead.'), \E_USER_DEPRECATED);
+
+        $decoder = new \SimplePie_Decode_HTML_Entities($data);
+        return $decoder->parse();
+    }
+
+    /**
+     * Remove RFC822 comments
+     *
+     * @param string $data Data to strip comments from
+     * @return string Comment stripped string
+     */
+    public static function uncomment_rfc822($string)
+    {
+        $string = (string) $string;
+        $position = 0;
+        $length = strlen($string);
+        $depth = 0;
+
+        $output = '';
+
+        while ($position < $length && ($pos = strpos($string, '(', $position)) !== false) {
+            $output .= substr($string, $position, $pos - $position);
+            $position = $pos + 1;
+            if ($string[$pos - 1] !== '\\') {
+                $depth++;
+                while ($depth && $position < $length) {
+                    $position += strcspn($string, '()', $position);
+                    if ($string[$position - 1] === '\\') {
+                        $position++;
+                        continue;
+                    } elseif (isset($string[$position])) {
+                        switch ($string[$position]) {
+                            case '(':
+                                $depth++;
+                                break;
+
+                            case ')':
+                                $depth--;
+                                break;
+                        }
+                        $position++;
+                    } else {
+                        break;
+                    }
+                }
+            } else {
+                $output .= '(';
+            }
+        }
+        $output .= substr($string, $position);
+
+        return $output;
+    }
+
+    public static function parse_mime($mime)
+    {
+        if (($pos = strpos($mime, ';')) === false) {
+            return trim($mime);
+        }
+
+        return trim(substr($mime, 0, $pos));
+    }
+
+    public static function atom_03_construct_type($attribs)
+    {
+        if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode'])) === 'base64') {
+            $mode = \SimplePie\SimplePie::CONSTRUCT_BASE64;
+        } else {
+            $mode = \SimplePie\SimplePie::CONSTRUCT_NONE;
+        }
+        if (isset($attribs['']['type'])) {
+            switch (strtolower(trim($attribs['']['type']))) {
+                case 'text':
+                case 'text/plain':
+                    return \SimplePie\SimplePie::CONSTRUCT_TEXT | $mode;
+
+                case 'html':
+                case 'text/html':
+                    return \SimplePie\SimplePie::CONSTRUCT_HTML | $mode;
+
+                case 'xhtml':
+                case 'application/xhtml+xml':
+                    return \SimplePie\SimplePie::CONSTRUCT_XHTML | $mode;
+
+                default:
+                    return \SimplePie\SimplePie::CONSTRUCT_NONE | $mode;
+            }
+        }
+
+        return \SimplePie\SimplePie::CONSTRUCT_TEXT | $mode;
+    }
+
+    public static function atom_10_construct_type($attribs)
+    {
+        if (isset($attribs['']['type'])) {
+            switch (strtolower(trim($attribs['']['type']))) {
+                case 'text':
+                    return \SimplePie\SimplePie::CONSTRUCT_TEXT;
+
+                case 'html':
+                    return \SimplePie\SimplePie::CONSTRUCT_HTML;
+
+                case 'xhtml':
+                    return \SimplePie\SimplePie::CONSTRUCT_XHTML;
+
+                default:
+                    return \SimplePie\SimplePie::CONSTRUCT_NONE;
+            }
+        }
+        return \SimplePie\SimplePie::CONSTRUCT_TEXT;
+    }
+
+    public static function atom_10_content_construct_type($attribs)
+    {
+        if (isset($attribs['']['type'])) {
+            $type = strtolower(trim($attribs['']['type']));
+            switch ($type) {
+                case 'text':
+                    return \SimplePie\SimplePie::CONSTRUCT_TEXT;
+
+                case 'html':
+                    return \SimplePie\SimplePie::CONSTRUCT_HTML;
+
+                case 'xhtml':
+                    return \SimplePie\SimplePie::CONSTRUCT_XHTML;
+            }
+            if (in_array(substr($type, -4), ['+xml', '/xml']) || substr($type, 0, 5) === 'text/') {
+                return \SimplePie\SimplePie::CONSTRUCT_NONE;
+            } else {
+                return \SimplePie\SimplePie::CONSTRUCT_BASE64;
+            }
+        }
+
+        return \SimplePie\SimplePie::CONSTRUCT_TEXT;
+    }
+
+    public static function is_isegment_nz_nc($string)
+    {
+        return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
+    }
+
+    public static function space_separated_tokens($string)
+    {
+        $space_characters = "\x20\x09\x0A\x0B\x0C\x0D";
+        $string_length = strlen($string);
+
+        $position = strspn($string, $space_characters);
+        $tokens = [];
+
+        while ($position < $string_length) {
+            $len = strcspn($string, $space_characters, $position);
+            $tokens[] = substr($string, $position, $len);
+            $position += $len;
+            $position += strspn($string, $space_characters, $position);
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Converts a unicode codepoint to a UTF-8 character
+     *
+     * @static
+     * @param int $codepoint Unicode codepoint
+     * @return string UTF-8 character
+     */
+    public static function codepoint_to_utf8($codepoint)
+    {
+        $codepoint = (int) $codepoint;
+        if ($codepoint < 0) {
+            return false;
+        } elseif ($codepoint <= 0x7f) {
+            return chr($codepoint);
+        } elseif ($codepoint <= 0x7ff) {
+            return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+        } elseif ($codepoint <= 0xffff) {
+            return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+        } elseif ($codepoint <= 0x10ffff) {
+            return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+        }
+
+        // U+FFFD REPLACEMENT CHARACTER
+        return "\xEF\xBF\xBD";
+    }
+
+    /**
+     * Similar to parse_str()
+     *
+     * Returns an associative array of name/value pairs, where the value is an
+     * array of values that have used the same name
+     *
+     * @static
+     * @param string $str The input string.
+     * @return array
+     */
+    public static function parse_str($str)
+    {
+        $return = [];
+        $str = explode('&', $str);
+
+        foreach ($str as $section) {
+            if (strpos($section, '=') !== false) {
+                [$name, $value] = explode('=', $section, 2);
+                $return[urldecode($name)][] = urldecode($value);
+            } else {
+                $return[urldecode($section)][] = null;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Detect XML encoding, as per XML 1.0 Appendix F.1
+     *
+     * @todo Add support for EBCDIC
+     * @param string $data XML data
+     * @param \SimplePie\Registry $registry Class registry
+     * @return array Possible encodings
+     */
+    public static function xml_encoding($data, $registry)
+    {
+        // UTF-32 Big Endian BOM
+        if (substr($data, 0, 4) === "\x00\x00\xFE\xFF") {
+            $encoding[] = 'UTF-32BE';
+        }
+        // UTF-32 Little Endian BOM
+        elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00") {
+            $encoding[] = 'UTF-32LE';
+        }
+        // UTF-16 Big Endian BOM
+        elseif (substr($data, 0, 2) === "\xFE\xFF") {
+            $encoding[] = 'UTF-16BE';
+        }
+        // UTF-16 Little Endian BOM
+        elseif (substr($data, 0, 2) === "\xFF\xFE") {
+            $encoding[] = 'UTF-16LE';
+        }
+        // UTF-8 BOM
+        elseif (substr($data, 0, 3) === "\xEF\xBB\xBF") {
+            $encoding[] = 'UTF-8';
+        }
+        // UTF-32 Big Endian Without BOM
+        elseif (substr($data, 0, 20) === "\x00\x00\x00\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C") {
+            if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E")) {
+                $parser = $registry->create(Parser::class, [Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8')]);
+                if ($parser->parse()) {
+                    $encoding[] = $parser->encoding;
+                }
+            }
+            $encoding[] = 'UTF-32BE';
+        }
+        // UTF-32 Little Endian Without BOM
+        elseif (substr($data, 0, 20) === "\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C\x00\x00\x00") {
+            if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00")) {
+                $parser = $registry->create(Parser::class, [Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8')]);
+                if ($parser->parse()) {
+                    $encoding[] = $parser->encoding;
+                }
+            }
+            $encoding[] = 'UTF-32LE';
+        }
+        // UTF-16 Big Endian Without BOM
+        elseif (substr($data, 0, 10) === "\x00\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C") {
+            if ($pos = strpos($data, "\x00\x3F\x00\x3E")) {
+                $parser = $registry->create(Parser::class, [Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8')]);
+                if ($parser->parse()) {
+                    $encoding[] = $parser->encoding;
+                }
+            }
+            $encoding[] = 'UTF-16BE';
+        }
+        // UTF-16 Little Endian Without BOM
+        elseif (substr($data, 0, 10) === "\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C\x00") {
+            if ($pos = strpos($data, "\x3F\x00\x3E\x00")) {
+                $parser = $registry->create(Parser::class, [Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8')]);
+                if ($parser->parse()) {
+                    $encoding[] = $parser->encoding;
+                }
+            }
+            $encoding[] = 'UTF-16LE';
+        }
+        // US-ASCII (or superset)
+        elseif (substr($data, 0, 5) === "\x3C\x3F\x78\x6D\x6C") {
+            if ($pos = strpos($data, "\x3F\x3E")) {
+                $parser = $registry->create(Parser::class, [substr($data, 5, $pos - 5)]);
+                if ($parser->parse()) {
+                    $encoding[] = $parser->encoding;
+                }
+            }
+            $encoding[] = 'UTF-8';
+        }
+        // Fallback to UTF-8
+        else {
+            $encoding[] = 'UTF-8';
+        }
+        return $encoding;
+    }
+
+    public static function output_javascript()
+    {
+        if (function_exists('ob_gzhandler')) {
+            ob_start('ob_gzhandler');
+        }
+        header('Content-type: text/javascript; charset: UTF-8');
+        header('Cache-Control: must-revalidate');
+        header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+
+        $body = <<<END
+function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
+       if (placeholder != '') {
+               document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
+       }
+       else {
+               document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" src="'+link+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="true" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
+       }
+}
+
+function embed_flash(bgcolor, width, height, link, loop, type) {
+       document.writeln('<embed src="'+link+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="'+type+'" quality="high" width="'+width+'" height="'+height+'" bgcolor="'+bgcolor+'" loop="'+loop+'"></embed>');
+}
+
+function embed_flv(width, height, link, placeholder, loop, player) {
+       document.writeln('<embed src="'+player+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="'+width+'" height="'+height+'" wmode="transparent" flashvars="file='+link+'&autostart=false&repeat='+loop+'&showdigits=true&showfsbutton=false"></embed>');
+}
+
+function embed_wmedia(width, height, link) {
+       document.writeln('<embed type="application/x-mplayer2" src="'+link+'" autosize="1" width="'+width+'" height="'+height+'" showcontrols="1" showstatusbar="0" showdisplay="0" autostart="0"></embed>');
+}
+END;
+        echo $body;
+    }
+
+    /**
+     * Get the SimplePie build timestamp
+     *
+     * Uses the git index if it exists, otherwise uses the modification time
+     * of the newest file.
+     */
+    public static function get_build()
+    {
+        if (static::$SIMPLEPIE_BUILD !== null) {
+            return static::$SIMPLEPIE_BUILD;
+        }
+
+        $root = dirname(__FILE__, 2);
+        if (file_exists($root . '/.git/index')) {
+            static::$SIMPLEPIE_BUILD = filemtime($root . '/.git/index');
+
+            return static::$SIMPLEPIE_BUILD;
+        } elseif (file_exists($root . '/SimplePie')) {
+            $time = 0;
+            foreach (glob($root . '/SimplePie/*.php') as $file) {
+                if (($mtime = filemtime($file)) > $time) {
+                    $time = $mtime;
+                }
+            }
+            static::$SIMPLEPIE_BUILD = $time;
+
+            return static::$SIMPLEPIE_BUILD;
+        } elseif (file_exists(dirname(__FILE__) . '/Core.php')) {
+            static::$SIMPLEPIE_BUILD = filemtime(dirname(__FILE__) . '/Core.php');
+
+            return static::$SIMPLEPIE_BUILD;
+        }
+
+        static::$SIMPLEPIE_BUILD = filemtime(__FILE__);
+
+        return static::$SIMPLEPIE_BUILD;
+    }
+
+    /**
+     * Get the default user agent string
+     *
+     * @return string
+     */
+    public static function get_default_useragent()
+    {
+        return \SimplePie\SimplePie::NAME . '/' . \SimplePie\SimplePie::VERSION . ' (Feed Parser; ' . \SimplePie\SimplePie::URL . '; Allow like Gecko) Build/' . static::get_build();
+    }
+
+    /**
+     * Format debugging information
+     */
+    public static function debug(&$sp)
+    {
+        $info = 'SimplePie ' . \SimplePie\SimplePie::VERSION . ' Build ' . static::get_build() . "\n";
+        $info .= 'PHP ' . PHP_VERSION . "\n";
+        if ($sp->error() !== null) {
+            $info .= 'Error occurred: ' . $sp->error() . "\n";
+        } else {
+            $info .= "No error found.\n";
+        }
+        $info .= "Extensions:\n";
+        $extensions = ['pcre', 'curl', 'zlib', 'mbstring', 'iconv', 'xmlreader', 'xml'];
+        foreach ($extensions as $ext) {
+            if (extension_loaded($ext)) {
+                $info .= "    $ext loaded\n";
+                switch ($ext) {
+                    case 'pcre':
+                        $info .= '      Version ' . PCRE_VERSION . "\n";
+                        break;
+                    case 'curl':
+                        $version = curl_version();
+                        $info .= '      Version ' . $version['version'] . "\n";
+                        break;
+                    case 'mbstring':
+                        $info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
+                        break;
+                    case 'iconv':
+                        $info .= '      Version ' . ICONV_VERSION . "\n";
+                        break;
+                    case 'xml':
+                        $info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
+                        break;
+                }
+            } else {
+                $info .= "    $ext not loaded\n";
+            }
+        }
+        return $info;
+    }
+
+    public static function silence_errors($num, $str)
+    {
+        // No-op
+    }
+
+    /**
+     * Sanitize a URL by removing HTTP credentials.
+     * @param string $url the URL to sanitize.
+     * @return string the same URL without HTTP credentials.
+     */
+    public static function url_remove_credentials($url)
+    {
+        return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url);
+    }
+}
+
+class_alias('SimplePie\Misc', 'SimplePie_Misc', false);
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcNetIPv6php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Net/IPv6.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Net/IPv6.php      2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Net/IPv6.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Net;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Class to validate and to work with IPv6 addresses.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,215 +57,201 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @author Josh Peck <jmp at joshpeck dot org>
</span><span class="cx" style="display: block; padding: 0 10px">  * @author Sam Sneddon <geoffers@gmail.com>
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_Net_IPv6
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class IPv6
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Uncompresses an IPv6 address
-        *
-        * RFC 4291 allows you to compress concecutive zero pieces in an address to
-        * '::'. This method expects a valid IPv6 address and expands the '::' to
-        * the required number of zero pieces.
-        *
-        * Example:  FF01::101   ->  FF01:0:0:0:0:0:0:101
-        *           ::1         ->  0:0:0:0:0:0:0:1
-        *
-        * @author Alexander Merz <alexander.merz@web.de>
-        * @author elfrink at introweb dot nl
-        * @author Josh Peck <jmp at joshpeck dot org>
-        * @copyright 2003-2005 The PHP Group
-        * @license http://www.opensource.org/licenses/bsd-license.php
-        * @param string $ip An IPv6 address
-        * @return string The uncompressed IPv6 address
-        */
-       public static function uncompress($ip)
-       {
-               $c1 = -1;
-               $c2 = -1;
-               if (substr_count($ip, '::') === 1)
-               {
-                       list($ip1, $ip2) = explode('::', $ip);
-                       if ($ip1 === '')
-                       {
-                               $c1 = -1;
-                       }
-                       else
-                       {
-                               $c1 = substr_count($ip1, ':');
-                       }
-                       if ($ip2 === '')
-                       {
-                               $c2 = -1;
-                       }
-                       else
-                       {
-                               $c2 = substr_count($ip2, ':');
-                       }
-                       if (strpos($ip2, '.') !== false)
-                       {
-                               $c2++;
-                       }
-                       // ::
-                       if ($c1 === -1 && $c2 === -1)
-                       {
-                               $ip = '0:0:0:0:0:0:0:0';
-                       }
-                       // ::xxx
-                       else if ($c1 === -1)
-                       {
-                               $fill = str_repeat('0:', 7 - $c2);
-                               $ip = str_replace('::', $fill, $ip);
-                       }
-                       // xxx::
-                       else if ($c2 === -1)
-                       {
-                               $fill = str_repeat(':0', 7 - $c1);
-                               $ip = str_replace('::', $fill, $ip);
-                       }
-                       // xxx::xxx
-                       else
-                       {
-                               $fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
-                               $ip = str_replace('::', $fill, $ip);
-                       }
-               }
-               return $ip;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Uncompresses an IPv6 address
+     *
+     * RFC 4291 allows you to compress concecutive zero pieces in an address to
+     * '::'. This method expects a valid IPv6 address and expands the '::' to
+     * the required number of zero pieces.
+     *
+     * Example:  FF01::101   ->  FF01:0:0:0:0:0:0:101
+     *           ::1         ->  0:0:0:0:0:0:0:1
+     *
+     * @author Alexander Merz <alexander.merz@web.de>
+     * @author elfrink at introweb dot nl
+     * @author Josh Peck <jmp at joshpeck dot org>
+     * @copyright 2003-2005 The PHP Group
+     * @license http://www.opensource.org/licenses/bsd-license.php
+     * @param string $ip An IPv6 address
+     * @return string The uncompressed IPv6 address
+     */
+    public static function uncompress($ip)
+    {
+        $c1 = -1;
+        $c2 = -1;
+        if (substr_count($ip, '::') === 1) {
+            [$ip1, $ip2] = explode('::', $ip);
+            if ($ip1 === '') {
+                $c1 = -1;
+            } else {
+                $c1 = substr_count($ip1, ':');
+            }
+            if ($ip2 === '') {
+                $c2 = -1;
+            } else {
+                $c2 = substr_count($ip2, ':');
+            }
+            if (strpos($ip2, '.') !== false) {
+                $c2++;
+            }
+            // ::
+            if ($c1 === -1 && $c2 === -1) {
+                $ip = '0:0:0:0:0:0:0:0';
+            }
+            // ::xxx
+            elseif ($c1 === -1) {
+                $fill = str_repeat('0:', 7 - $c2);
+                $ip = str_replace('::', $fill, $ip);
+            }
+            // xxx::
+            elseif ($c2 === -1) {
+                $fill = str_repeat(':0', 7 - $c1);
+                $ip = str_replace('::', $fill, $ip);
+            }
+            // xxx::xxx
+            else {
+                $fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+                $ip = str_replace('::', $fill, $ip);
+            }
+        }
+        return $ip;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Compresses an IPv6 address
-        *
-        * RFC 4291 allows you to compress concecutive zero pieces in an address to
-        * '::'. This method expects a valid IPv6 address and compresses consecutive
-        * zero pieces to '::'.
-        *
-        * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
-        *           0:0:0:0:0:0:0:1        ->  ::1
-        *
-        * @see uncompress()
-        * @param string $ip An IPv6 address
-        * @return string The compressed IPv6 address
-        */
-       public static function compress($ip)
-       {
-               // Prepare the IP to be compressed
-               $ip = self::uncompress($ip);
-               $ip_parts = self::split_v6_v4($ip);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Compresses an IPv6 address
+     *
+     * RFC 4291 allows you to compress concecutive zero pieces in an address to
+     * '::'. This method expects a valid IPv6 address and compresses consecutive
+     * zero pieces to '::'.
+     *
+     * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
+     *           0:0:0:0:0:0:0:1        ->  ::1
+     *
+     * @see uncompress()
+     * @param string $ip An IPv6 address
+     * @return string The compressed IPv6 address
+     */
+    public static function compress($ip)
+    {
+        // Prepare the IP to be compressed
+        $ip = self::uncompress($ip);
+        $ip_parts = self::split_v6_v4($ip);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Replace all leading zeros
-               $ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        // Replace all leading zeros
+        $ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Find bunches of zeros
-               if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE))
-               {
-                       $max = 0;
-                       $pos = null;
-                       foreach ($matches[0] as $match)
-                       {
-                               if (strlen($match[0]) > $max)
-                               {
-                                       $max = strlen($match[0]);
-                                       $pos = $match[1];
-                               }
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        // Find bunches of zeros
+        if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
+            $max = 0;
+            $pos = null;
+            foreach ($matches[0] as $match) {
+                if (strlen($match[0]) > $max) {
+                    $max = strlen($match[0]);
+                    $pos = $match[1];
+                }
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            $ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ($ip_parts[1] !== '')
-               {
-                       return implode(':', $ip_parts);
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if ($ip_parts[1] !== '') {
+            return implode(':', $ip_parts);
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $ip_parts[0];
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return $ip_parts[0];
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Splits an IPv6 address into the IPv6 and IPv4 representation parts
-        *
-        * RFC 4291 allows you to represent the last two parts of an IPv6 address
-        * using the standard IPv4 representation
-        *
-        * Example:  0:0:0:0:0:0:13.1.68.3
-        *           0:0:0:0:0:FFFF:129.144.52.38
-        *
-        * @param string $ip An IPv6 address
-        * @return array [0] contains the IPv6 represented part, and [1] the IPv4 represented part
-        */
-       private static function split_v6_v4($ip)
-       {
-               if (strpos($ip, '.') !== false)
-               {
-                       $pos = strrpos($ip, ':');
-                       $ipv6_part = substr($ip, 0, $pos);
-                       $ipv4_part = substr($ip, $pos + 1);
-                       return array($ipv6_part, $ipv4_part);
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Splits an IPv6 address into the IPv6 and IPv4 representation parts
+     *
+     * RFC 4291 allows you to represent the last two parts of an IPv6 address
+     * using the standard IPv4 representation
+     *
+     * Example:  0:0:0:0:0:0:13.1.68.3
+     *           0:0:0:0:0:FFFF:129.144.52.38
+     *
+     * @param string $ip An IPv6 address
+     * @return array [0] contains the IPv6 represented part, and [1] the IPv4 represented part
+     */
+    private static function split_v6_v4($ip)
+    {
+        if (strpos($ip, '.') !== false) {
+            $pos = strrpos($ip, ':');
+            $ipv6_part = substr($ip, 0, $pos);
+            $ipv4_part = substr($ip, $pos + 1);
+            return [$ipv6_part, $ipv4_part];
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return array($ip, '');
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return [$ip, ''];
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Checks an IPv6 address
-        *
-        * Checks if the given IP is a valid IPv6 address
-        *
-        * @param string $ip An IPv6 address
-        * @return bool true if $ip is a valid IPv6 address
-        */
-       public static function check_ipv6($ip)
-       {
-               $ip = self::uncompress($ip);
-               list($ipv6, $ipv4) = self::split_v6_v4($ip);
-               $ipv6 = explode(':', $ipv6);
-               $ipv4 = explode('.', $ipv4);
-               if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4)
-               {
-                       foreach ($ipv6 as $ipv6_part)
-                       {
-                               // The section can't be empty
-                               if ($ipv6_part === '')
-                                       return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Checks an IPv6 address
+     *
+     * Checks if the given IP is a valid IPv6 address
+     *
+     * @param string $ip An IPv6 address
+     * @return bool true if $ip is a valid IPv6 address
+     */
+    public static function check_ipv6($ip)
+    {
+        $ip = self::uncompress($ip);
+        [$ipv6, $ipv4] = self::split_v6_v4($ip);
+        $ipv6 = explode(':', $ipv6);
+        $ipv4 = explode('.', $ipv4);
+        if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
+            foreach ($ipv6 as $ipv6_part) {
+                // The section can't be empty
+                if ($ipv6_part === '') {
+                    return false;
+                }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Nor can it be over four characters
-                               if (strlen($ipv6_part) > 4)
-                                       return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Nor can it be over four characters
+                if (strlen($ipv6_part) > 4) {
+                    return false;
+                }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Remove leading zeros (this is safe because of the above)
-                               $ipv6_part = ltrim($ipv6_part, '0');
-                               if ($ipv6_part === '')
-                                       $ipv6_part = '0';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Remove leading zeros (this is safe because of the above)
+                $ipv6_part = ltrim($ipv6_part, '0');
+                if ($ipv6_part === '') {
+                    $ipv6_part = '0';
+                }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Check the value is valid
-                               $value = hexdec($ipv6_part);
-                               if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
-                                       return false;
-                       }
-                       if (count($ipv4) === 4)
-                       {
-                               foreach ($ipv4 as $ipv4_part)
-                               {
-                                       $value = (int) $ipv4_part;
-                                       if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
-                                               return false;
-                               }
-                       }
-                       return true;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Check the value is valid
+                $value = hexdec($ipv6_part);
+                if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+                    return false;
+                }
+            }
+            if (count($ipv4) === 4) {
+                foreach ($ipv4 as $ipv4_part) {
+                    $value = (int) $ipv4_part;
+                    if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Checks if the given IP is a valid IPv6 address
-        *
-        * @codeCoverageIgnore
-        * @deprecated Use {@see SimplePie_Net_IPv6::check_ipv6()} instead
-        * @see check_ipv6
-        * @param string $ip An IPv6 address
-        * @return bool true if $ip is a valid IPv6 address
-        */
-       public static function checkIPv6($ip)
-       {
-               return self::check_ipv6($ip);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Checks if the given IP is a valid IPv6 address
+     *
+     * @codeCoverageIgnore
+     * @deprecated Use {@see IPv6::check_ipv6()} instead
+     * @see check_ipv6
+     * @param string $ip An IPv6 address
+     * @return bool true if $ip is a valid IPv6 address
+     */
+    public static function checkIPv6($ip)
+    {
+        return self::check_ipv6($ip);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\Net\IPv6', 'SimplePie_Net_IPv6');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcParseDatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/Parse/Date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/Parse/Date.php    2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/Parse/Date.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\Parse;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Date Parser
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,978 +50,939 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Parsing
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_Parse_Date
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Date
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Input data
-        *
-        * @access protected
-        * @var string
-        */
-       var $date;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Input data
+     *
+     * @access protected
+     * @var string
+     */
+    public $date;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * List of days, calendar day name => ordinal day number in the week
-        *
-        * @access protected
-        * @var array
-        */
-       var $day = array(
-               // English
-               'mon' => 1,
-               'monday' => 1,
-               'tue' => 2,
-               'tuesday' => 2,
-               'wed' => 3,
-               'wednesday' => 3,
-               'thu' => 4,
-               'thursday' => 4,
-               'fri' => 5,
-               'friday' => 5,
-               'sat' => 6,
-               'saturday' => 6,
-               'sun' => 7,
-               'sunday' => 7,
-               // Dutch
-               'maandag' => 1,
-               'dinsdag' => 2,
-               'woensdag' => 3,
-               'donderdag' => 4,
-               'vrijdag' => 5,
-               'zaterdag' => 6,
-               'zondag' => 7,
-               // French
-               'lundi' => 1,
-               'mardi' => 2,
-               'mercredi' => 3,
-               'jeudi' => 4,
-               'vendredi' => 5,
-               'samedi' => 6,
-               'dimanche' => 7,
-               // German
-               'montag' => 1,
-               'mo' => 1,
-               'dienstag' => 2,
-               'di' => 2,
-               'mittwoch' => 3,
-               'mi' => 3,
-               'donnerstag' => 4,
-               'do' => 4,
-               'freitag' => 5,
-               'fr' => 5,
-               'samstag' => 6,
-               'sa' => 6,
-               'sonnabend' => 6,
-               // AFAIK no short form for sonnabend
-               'so' => 7,
-               'sonntag' => 7,
-               // Italian
-               'lunedì' => 1,
-               'martedì' => 2,
-               'mercoledì' => 3,
-               'giovedì' => 4,
-               'venerdì' => 5,
-               'sabato' => 6,
-               'domenica' => 7,
-               // Spanish
-               'lunes' => 1,
-               'martes' => 2,
-               'miércoles' => 3,
-               'jueves' => 4,
-               'viernes' => 5,
-               'sábado' => 6,
-               'domingo' => 7,
-               // Finnish
-               'maanantai' => 1,
-               'tiistai' => 2,
-               'keskiviikko' => 3,
-               'torstai' => 4,
-               'perjantai' => 5,
-               'lauantai' => 6,
-               'sunnuntai' => 7,
-               // Hungarian
-               'hétfő' => 1,
-               'kedd' => 2,
-               'szerda' => 3,
-               'csütörtok' => 4,
-               'péntek' => 5,
-               'szombat' => 6,
-               'vasárnap' => 7,
-               // Greek
-               'Δευ' => 1,
-               'Τρι' => 2,
-               'Τετ' => 3,
-               'Πεμ' => 4,
-               'Παρ' => 5,
-               'Σαβ' => 6,
-               'Κυρ' => 7,
-               // Russian
-               'Пн.' => 1,
-               'Вт.' => 2,
-               'Ср.' => 3,
-               'Чт.' => 4,
-               'Пт.' => 5,
-               'Сб.' => 6,
-               'Вс.' => 7,
-       );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * List of days, calendar day name => ordinal day number in the week
+     *
+     * @access protected
+     * @var array
+     */
+    public $day = [
+        // English
+        'mon' => 1,
+        'monday' => 1,
+        'tue' => 2,
+        'tuesday' => 2,
+        'wed' => 3,
+        'wednesday' => 3,
+        'thu' => 4,
+        'thursday' => 4,
+        'fri' => 5,
+        'friday' => 5,
+        'sat' => 6,
+        'saturday' => 6,
+        'sun' => 7,
+        'sunday' => 7,
+        // Dutch
+        'maandag' => 1,
+        'dinsdag' => 2,
+        'woensdag' => 3,
+        'donderdag' => 4,
+        'vrijdag' => 5,
+        'zaterdag' => 6,
+        'zondag' => 7,
+        // French
+        'lundi' => 1,
+        'mardi' => 2,
+        'mercredi' => 3,
+        'jeudi' => 4,
+        'vendredi' => 5,
+        'samedi' => 6,
+        'dimanche' => 7,
+        // German
+        'montag' => 1,
+        'mo' => 1,
+        'dienstag' => 2,
+        'di' => 2,
+        'mittwoch' => 3,
+        'mi' => 3,
+        'donnerstag' => 4,
+        'do' => 4,
+        'freitag' => 5,
+        'fr' => 5,
+        'samstag' => 6,
+        'sa' => 6,
+        'sonnabend' => 6,
+        // AFAIK no short form for sonnabend
+        'so' => 7,
+        'sonntag' => 7,
+        // Italian
+        'lunedì' => 1,
+        'martedì' => 2,
+        'mercoledì' => 3,
+        'giovedì' => 4,
+        'venerdì' => 5,
+        'sabato' => 6,
+        'domenica' => 7,
+        // Spanish
+        'lunes' => 1,
+        'martes' => 2,
+        'miércoles' => 3,
+        'jueves' => 4,
+        'viernes' => 5,
+        'sábado' => 6,
+        'domingo' => 7,
+        // Finnish
+        'maanantai' => 1,
+        'tiistai' => 2,
+        'keskiviikko' => 3,
+        'torstai' => 4,
+        'perjantai' => 5,
+        'lauantai' => 6,
+        'sunnuntai' => 7,
+        // Hungarian
+        'hétfő' => 1,
+        'kedd' => 2,
+        'szerda' => 3,
+        'csütörtok' => 4,
+        'péntek' => 5,
+        'szombat' => 6,
+        'vasárnap' => 7,
+        // Greek
+        'Δευ' => 1,
+        'Τρι' => 2,
+        'Τετ' => 3,
+        'Πεμ' => 4,
+        'Παρ' => 5,
+        'Σαβ' => 6,
+        'Κυρ' => 7,
+        // Russian
+        'Пн.' => 1,
+        'Вт.' => 2,
+        'Ср.' => 3,
+        'Чт.' => 4,
+        'Пт.' => 5,
+        'Сб.' => 6,
+        'Вс.' => 7,
+    ];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * List of months, calendar month name => calendar month number
-        *
-        * @access protected
-        * @var array
-        */
-       var $month = array(
-               // English
-               'jan' => 1,
-               'january' => 1,
-               'feb' => 2,
-               'february' => 2,
-               'mar' => 3,
-               'march' => 3,
-               'apr' => 4,
-               'april' => 4,
-               'may' => 5,
-               // No long form of May
-               'jun' => 6,
-               'june' => 6,
-               'jul' => 7,
-               'july' => 7,
-               'aug' => 8,
-               'august' => 8,
-               'sep' => 9,
-               'september' => 9,
-               'oct' => 10,
-               'october' => 10,
-               'nov' => 11,
-               'november' => 11,
-               'dec' => 12,
-               'december' => 12,
-               // Dutch
-               'januari' => 1,
-               'februari' => 2,
-               'maart' => 3,
-               'april' => 4,
-               'mei' => 5,
-               'juni' => 6,
-               'juli' => 7,
-               'augustus' => 8,
-               'september' => 9,
-               'oktober' => 10,
-               'november' => 11,
-               'december' => 12,
-               // French
-               'janvier' => 1,
-               'février' => 2,
-               'mars' => 3,
-               'avril' => 4,
-               'mai' => 5,
-               'juin' => 6,
-               'juillet' => 7,
-               'août' => 8,
-               'septembre' => 9,
-               'octobre' => 10,
-               'novembre' => 11,
-               'décembre' => 12,
-               // German
-               'januar' => 1,
-               'jan' => 1,
-               'februar' => 2,
-               'feb' => 2,
-               'märz' => 3,
-               'mär' => 3,
-               'april' => 4,
-               'apr' => 4,
-               'mai' => 5, // no short form for may
-               'juni' => 6,
-               'jun' => 6,
-               'juli' => 7,
-               'jul' => 7,
-               'august' => 8,
-               'aug' => 8,
-               'september' => 9,
-               'sep' => 9,
-               'oktober' => 10,
-               'okt' => 10,
-               'november' => 11,
-               'nov' => 11,
-               'dezember' => 12,
-               'dez' => 12,
-               // Italian
-               'gennaio' => 1,
-               'febbraio' => 2,
-               'marzo' => 3,
-               'aprile' => 4,
-               'maggio' => 5,
-               'giugno' => 6,
-               'luglio' => 7,
-               'agosto' => 8,
-               'settembre' => 9,
-               'ottobre' => 10,
-               'novembre' => 11,
-               'dicembre' => 12,
-               // Spanish
-               'enero' => 1,
-               'febrero' => 2,
-               'marzo' => 3,
-               'abril' => 4,
-               'mayo' => 5,
-               'junio' => 6,
-               'julio' => 7,
-               'agosto' => 8,
-               'septiembre' => 9,
-               'setiembre' => 9,
-               'octubre' => 10,
-               'noviembre' => 11,
-               'diciembre' => 12,
-               // Finnish
-               'tammikuu' => 1,
-               'helmikuu' => 2,
-               'maaliskuu' => 3,
-               'huhtikuu' => 4,
-               'toukokuu' => 5,
-               'kesäkuu' => 6,
-               'heinäkuu' => 7,
-               'elokuu' => 8,
-               'suuskuu' => 9,
-               'lokakuu' => 10,
-               'marras' => 11,
-               'joulukuu' => 12,
-               // Hungarian
-               'január' => 1,
-               'február' => 2,
-               'március' => 3,
-               'április' => 4,
-               'május' => 5,
-               'június' => 6,
-               'július' => 7,
-               'augusztus' => 8,
-               'szeptember' => 9,
-               'október' => 10,
-               'november' => 11,
-               'december' => 12,
-               // Greek
-               'Ιαν' => 1,
-               'Φεβ' => 2,
-               'Μάώ' => 3,
-               'Μαώ' => 3,
-               'Απρ' => 4,
-               'Μάι' => 5,
-               'Μαϊ' => 5,
-               'Μαι' => 5,
-               'Ιούν' => 6,
-               'Ιον' => 6,
-               'Ιούλ' => 7,
-               'Ιολ' => 7,
-               'Αύγ' => 8,
-               'Αυγ' => 8,
-               'Σεπ' => 9,
-               'Οκτ' => 10,
-               'Νοέ' => 11,
-               'Δεκ' => 12,              
-               // Russian
-               'Янв' => 1,
-               'января' => 1,
-               'Фев' => 2,
-               'февраля' => 2,
-               'Мар' => 3,
-               'марта' => 3,
-               'Апр' => 4,
-               'апреля' => 4,
-               'Май' => 5,
-               'мая' => 5,
-               'Июн' => 6,
-               'июня' => 6,
-               'Июл' => 7,
-               'июля' => 7,
-               'Авг' => 8,
-               'августа' => 8,
-               'Сен' => 9,
-               'сентября' => 9,
-               'Окт' => 10,
-               'октября' => 10,
-               'Ноя' => 11,
-               'ноября' => 11,
-               'Дек' => 12,
-               'декабря' => 12,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * List of months, calendar month name => calendar month number
+     *
+     * @access protected
+     * @var array
+     */
+    public $month = [
+        // English
+        'jan' => 1,
+        'january' => 1,
+        'feb' => 2,
+        'february' => 2,
+        'mar' => 3,
+        'march' => 3,
+        'apr' => 4,
+        'april' => 4,
+        'may' => 5,
+        // No long form of May
+        'jun' => 6,
+        'june' => 6,
+        'jul' => 7,
+        'july' => 7,
+        'aug' => 8,
+        'august' => 8,
+        'sep' => 9,
+        'september' => 9,
+        'oct' => 10,
+        'october' => 10,
+        'nov' => 11,
+        'november' => 11,
+        'dec' => 12,
+        'december' => 12,
+        // Dutch
+        'januari' => 1,
+        'februari' => 2,
+        'maart' => 3,
+        'april' => 4,
+        'mei' => 5,
+        'juni' => 6,
+        'juli' => 7,
+        'augustus' => 8,
+        'september' => 9,
+        'oktober' => 10,
+        'november' => 11,
+        'december' => 12,
+        // French
+        'janvier' => 1,
+        'février' => 2,
+        'mars' => 3,
+        'avril' => 4,
+        'mai' => 5,
+        'juin' => 6,
+        'juillet' => 7,
+        'août' => 8,
+        'septembre' => 9,
+        'octobre' => 10,
+        'novembre' => 11,
+        'décembre' => 12,
+        // German
+        'januar' => 1,
+        'jan' => 1,
+        'februar' => 2,
+        'feb' => 2,
+        'märz' => 3,
+        'mär' => 3,
+        'april' => 4,
+        'apr' => 4,
+        'mai' => 5, // no short form for may
+        'juni' => 6,
+        'jun' => 6,
+        'juli' => 7,
+        'jul' => 7,
+        'august' => 8,
+        'aug' => 8,
+        'september' => 9,
+        'sep' => 9,
+        'oktober' => 10,
+        'okt' => 10,
+        'november' => 11,
+        'nov' => 11,
+        'dezember' => 12,
+        'dez' => 12,
+        // Italian
+        'gennaio' => 1,
+        'febbraio' => 2,
+        'marzo' => 3,
+        'aprile' => 4,
+        'maggio' => 5,
+        'giugno' => 6,
+        'luglio' => 7,
+        'agosto' => 8,
+        'settembre' => 9,
+        'ottobre' => 10,
+        'novembre' => 11,
+        'dicembre' => 12,
+        // Spanish
+        'enero' => 1,
+        'febrero' => 2,
+        'marzo' => 3,
+        'abril' => 4,
+        'mayo' => 5,
+        'junio' => 6,
+        'julio' => 7,
+        'agosto' => 8,
+        'septiembre' => 9,
+        'setiembre' => 9,
+        'octubre' => 10,
+        'noviembre' => 11,
+        'diciembre' => 12,
+        // Finnish
+        'tammikuu' => 1,
+        'helmikuu' => 2,
+        'maaliskuu' => 3,
+        'huhtikuu' => 4,
+        'toukokuu' => 5,
+        'kesäkuu' => 6,
+        'heinäkuu' => 7,
+        'elokuu' => 8,
+        'suuskuu' => 9,
+        'lokakuu' => 10,
+        'marras' => 11,
+        'joulukuu' => 12,
+        // Hungarian
+        'január' => 1,
+        'február' => 2,
+        'március' => 3,
+        'április' => 4,
+        'május' => 5,
+        'június' => 6,
+        'július' => 7,
+        'augusztus' => 8,
+        'szeptember' => 9,
+        'október' => 10,
+        'november' => 11,
+        'december' => 12,
+        // Greek
+        'Ιαν' => 1,
+        'Φεβ' => 2,
+        'Μάώ' => 3,
+        'Μαώ' => 3,
+        'Απρ' => 4,
+        'Μάι' => 5,
+        'Μαϊ' => 5,
+        'Μαι' => 5,
+        'Ιούν' => 6,
+        'Ιον' => 6,
+        'Ιούλ' => 7,
+        'Ιολ' => 7,
+        'Αύγ' => 8,
+        'Αυγ' => 8,
+        'Σεπ' => 9,
+        'Οκτ' => 10,
+        'Νοέ' => 11,
+        'Δεκ' => 12,
+        // Russian
+        'Янв' => 1,
+        'января' => 1,
+        'Фев' => 2,
+        'февраля' => 2,
+        'Мар' => 3,
+        'марта' => 3,
+        'Апр' => 4,
+        'апреля' => 4,
+        'Май' => 5,
+        'мая' => 5,
+        'Июн' => 6,
+        'июня' => 6,
+        'Июл' => 7,
+        'июля' => 7,
+        'Авг' => 8,
+        'августа' => 8,
+        'Сен' => 9,
+        'сентября' => 9,
+        'Окт' => 10,
+        'октября' => 10,
+        'Ноя' => 11,
+        'ноября' => 11,
+        'Дек' => 12,
+        'декабря' => 12,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    ];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * List of timezones, abbreviation => offset from UTC
-        *
-        * @access protected
-        * @var array
-        */
-       var $timezone = array(
-               'ACDT' => 37800,
-               'ACIT' => 28800,
-               'ACST' => 34200,
-               'ACT' => -18000,
-               'ACWDT' => 35100,
-               'ACWST' => 31500,
-               'AEDT' => 39600,
-               'AEST' => 36000,
-               'AFT' => 16200,
-               'AKDT' => -28800,
-               'AKST' => -32400,
-               'AMDT' => 18000,
-               'AMT' => -14400,
-               'ANAST' => 46800,
-               'ANAT' => 43200,
-               'ART' => -10800,
-               'AZOST' => -3600,
-               'AZST' => 18000,
-               'AZT' => 14400,
-               'BIOT' => 21600,
-               'BIT' => -43200,
-               'BOT' => -14400,
-               'BRST' => -7200,
-               'BRT' => -10800,
-               'BST' => 3600,
-               'BTT' => 21600,
-               'CAST' => 18000,
-               'CAT' => 7200,
-               'CCT' => 23400,
-               'CDT' => -18000,
-               'CEDT' => 7200,
-               'CEST' => 7200,
-               'CET' => 3600,
-               'CGST' => -7200,
-               'CGT' => -10800,
-               'CHADT' => 49500,
-               'CHAST' => 45900,
-               'CIST' => -28800,
-               'CKT' => -36000,
-               'CLDT' => -10800,
-               'CLST' => -14400,
-               'COT' => -18000,
-               'CST' => -21600,
-               'CVT' => -3600,
-               'CXT' => 25200,
-               'DAVT' => 25200,
-               'DTAT' => 36000,
-               'EADT' => -18000,
-               'EAST' => -21600,
-               'EAT' => 10800,
-               'ECT' => -18000,
-               'EDT' => -14400,
-               'EEST' => 10800,
-               'EET' => 7200,
-               'EGT' => -3600,
-               'EKST' => 21600,
-               'EST' => -18000,
-               'FJT' => 43200,
-               'FKDT' => -10800,
-               'FKST' => -14400,
-               'FNT' => -7200,
-               'GALT' => -21600,
-               'GEDT' => 14400,
-               'GEST' => 10800,
-               'GFT' => -10800,
-               'GILT' => 43200,
-               'GIT' => -32400,
-               'GST' => 14400,
-               'GST' => -7200,
-               'GYT' => -14400,
-               'HAA' => -10800,
-               'HAC' => -18000,
-               'HADT' => -32400,
-               'HAE' => -14400,
-               'HAP' => -25200,
-               'HAR' => -21600,
-               'HAST' => -36000,
-               'HAT' => -9000,
-               'HAY' => -28800,
-               'HKST' => 28800,
-               'HMT' => 18000,
-               'HNA' => -14400,
-               'HNC' => -21600,
-               'HNE' => -18000,
-               'HNP' => -28800,
-               'HNR' => -25200,
-               'HNT' => -12600,
-               'HNY' => -32400,
-               'IRDT' => 16200,
-               'IRKST' => 32400,
-               'IRKT' => 28800,
-               'IRST' => 12600,
-               'JFDT' => -10800,
-               'JFST' => -14400,
-               'JST' => 32400,
-               'KGST' => 21600,
-               'KGT' => 18000,
-               'KOST' => 39600,
-               'KOVST' => 28800,
-               'KOVT' => 25200,
-               'KRAST' => 28800,
-               'KRAT' => 25200,
-               'KST' => 32400,
-               'LHDT' => 39600,
-               'LHST' => 37800,
-               'LINT' => 50400,
-               'LKT' => 21600,
-               'MAGST' => 43200,
-               'MAGT' => 39600,
-               'MAWT' => 21600,
-               'MDT' => -21600,
-               'MESZ' => 7200,
-               'MEZ' => 3600,
-               'MHT' => 43200,
-               'MIT' => -34200,
-               'MNST' => 32400,
-               'MSDT' => 14400,
-               'MSST' => 10800,
-               'MST' => -25200,
-               'MUT' => 14400,
-               'MVT' => 18000,
-               'MYT' => 28800,
-               'NCT' => 39600,
-               'NDT' => -9000,
-               'NFT' => 41400,
-               'NMIT' => 36000,
-               'NOVST' => 25200,
-               'NOVT' => 21600,
-               'NPT' => 20700,
-               'NRT' => 43200,
-               'NST' => -12600,
-               'NUT' => -39600,
-               'NZDT' => 46800,
-               'NZST' => 43200,
-               'OMSST' => 25200,
-               'OMST' => 21600,
-               'PDT' => -25200,
-               'PET' => -18000,
-               'PETST' => 46800,
-               'PETT' => 43200,
-               'PGT' => 36000,
-               'PHOT' => 46800,
-               'PHT' => 28800,
-               'PKT' => 18000,
-               'PMDT' => -7200,
-               'PMST' => -10800,
-               'PONT' => 39600,
-               'PST' => -28800,
-               'PWT' => 32400,
-               'PYST' => -10800,
-               'PYT' => -14400,
-               'RET' => 14400,
-               'ROTT' => -10800,
-               'SAMST' => 18000,
-               'SAMT' => 14400,
-               'SAST' => 7200,
-               'SBT' => 39600,
-               'SCDT' => 46800,
-               'SCST' => 43200,
-               'SCT' => 14400,
-               'SEST' => 3600,
-               'SGT' => 28800,
-               'SIT' => 28800,
-               'SRT' => -10800,
-               'SST' => -39600,
-               'SYST' => 10800,
-               'SYT' => 7200,
-               'TFT' => 18000,
-               'THAT' => -36000,
-               'TJT' => 18000,
-               'TKT' => -36000,
-               'TMT' => 18000,
-               'TOT' => 46800,
-               'TPT' => 32400,
-               'TRUT' => 36000,
-               'TVT' => 43200,
-               'TWT' => 28800,
-               'UYST' => -7200,
-               'UYT' => -10800,
-               'UZT' => 18000,
-               'VET' => -14400,
-               'VLAST' => 39600,
-               'VLAT' => 36000,
-               'VOST' => 21600,
-               'VUT' => 39600,
-               'WAST' => 7200,
-               'WAT' => 3600,
-               'WDT' => 32400,
-               'WEST' => 3600,
-               'WFT' => 43200,
-               'WIB' => 25200,
-               'WIT' => 32400,
-               'WITA' => 28800,
-               'WKST' => 18000,
-               'WST' => 28800,
-               'YAKST' => 36000,
-               'YAKT' => 32400,
-               'YAPT' => 36000,
-               'YEKST' => 21600,
-               'YEKT' => 18000,
-       );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * List of timezones, abbreviation => offset from UTC
+     *
+     * @access protected
+     * @var array
+     */
+    public $timezone = [
+        'ACDT' => 37800,
+        'ACIT' => 28800,
+        'ACST' => 34200,
+        'ACT' => -18000,
+        'ACWDT' => 35100,
+        'ACWST' => 31500,
+        'AEDT' => 39600,
+        'AEST' => 36000,
+        'AFT' => 16200,
+        'AKDT' => -28800,
+        'AKST' => -32400,
+        'AMDT' => 18000,
+        'AMT' => -14400,
+        'ANAST' => 46800,
+        'ANAT' => 43200,
+        'ART' => -10800,
+        'AZOST' => -3600,
+        'AZST' => 18000,
+        'AZT' => 14400,
+        'BIOT' => 21600,
+        'BIT' => -43200,
+        'BOT' => -14400,
+        'BRST' => -7200,
+        'BRT' => -10800,
+        'BST' => 3600,
+        'BTT' => 21600,
+        'CAST' => 18000,
+        'CAT' => 7200,
+        'CCT' => 23400,
+        'CDT' => -18000,
+        'CEDT' => 7200,
+        'CEST' => 7200,
+        'CET' => 3600,
+        'CGST' => -7200,
+        'CGT' => -10800,
+        'CHADT' => 49500,
+        'CHAST' => 45900,
+        'CIST' => -28800,
+        'CKT' => -36000,
+        'CLDT' => -10800,
+        'CLST' => -14400,
+        'COT' => -18000,
+        'CST' => -21600,
+        'CVT' => -3600,
+        'CXT' => 25200,
+        'DAVT' => 25200,
+        'DTAT' => 36000,
+        'EADT' => -18000,
+        'EAST' => -21600,
+        'EAT' => 10800,
+        'ECT' => -18000,
+        'EDT' => -14400,
+        'EEST' => 10800,
+        'EET' => 7200,
+        'EGT' => -3600,
+        'EKST' => 21600,
+        'EST' => -18000,
+        'FJT' => 43200,
+        'FKDT' => -10800,
+        'FKST' => -14400,
+        'FNT' => -7200,
+        'GALT' => -21600,
+        'GEDT' => 14400,
+        'GEST' => 10800,
+        'GFT' => -10800,
+        'GILT' => 43200,
+        'GIT' => -32400,
+        'GST' => 14400,
+        'GST' => -7200,
+        'GYT' => -14400,
+        'HAA' => -10800,
+        'HAC' => -18000,
+        'HADT' => -32400,
+        'HAE' => -14400,
+        'HAP' => -25200,
+        'HAR' => -21600,
+        'HAST' => -36000,
+        'HAT' => -9000,
+        'HAY' => -28800,
+        'HKST' => 28800,
+        'HMT' => 18000,
+        'HNA' => -14400,
+        'HNC' => -21600,
+        'HNE' => -18000,
+        'HNP' => -28800,
+        'HNR' => -25200,
+        'HNT' => -12600,
+        'HNY' => -32400,
+        'IRDT' => 16200,
+        'IRKST' => 32400,
+        'IRKT' => 28800,
+        'IRST' => 12600,
+        'JFDT' => -10800,
+        'JFST' => -14400,
+        'JST' => 32400,
+        'KGST' => 21600,
+        'KGT' => 18000,
+        'KOST' => 39600,
+        'KOVST' => 28800,
+        'KOVT' => 25200,
+        'KRAST' => 28800,
+        'KRAT' => 25200,
+        'KST' => 32400,
+        'LHDT' => 39600,
+        'LHST' => 37800,
+        'LINT' => 50400,
+        'LKT' => 21600,
+        'MAGST' => 43200,
+        'MAGT' => 39600,
+        'MAWT' => 21600,
+        'MDT' => -21600,
+        'MESZ' => 7200,
+        'MEZ' => 3600,
+        'MHT' => 43200,
+        'MIT' => -34200,
+        'MNST' => 32400,
+        'MSDT' => 14400,
+        'MSST' => 10800,
+        'MST' => -25200,
+        'MUT' => 14400,
+        'MVT' => 18000,
+        'MYT' => 28800,
+        'NCT' => 39600,
+        'NDT' => -9000,
+        'NFT' => 41400,
+        'NMIT' => 36000,
+        'NOVST' => 25200,
+        'NOVT' => 21600,
+        'NPT' => 20700,
+        'NRT' => 43200,
+        'NST' => -12600,
+        'NUT' => -39600,
+        'NZDT' => 46800,
+        'NZST' => 43200,
+        'OMSST' => 25200,
+        'OMST' => 21600,
+        'PDT' => -25200,
+        'PET' => -18000,
+        'PETST' => 46800,
+        'PETT' => 43200,
+        'PGT' => 36000,
+        'PHOT' => 46800,
+        'PHT' => 28800,
+        'PKT' => 18000,
+        'PMDT' => -7200,
+        'PMST' => -10800,
+        'PONT' => 39600,
+        'PST' => -28800,
+        'PWT' => 32400,
+        'PYST' => -10800,
+        'PYT' => -14400,
+        'RET' => 14400,
+        'ROTT' => -10800,
+        'SAMST' => 18000,
+        'SAMT' => 14400,
+        'SAST' => 7200,
+        'SBT' => 39600,
+        'SCDT' => 46800,
+        'SCST' => 43200,
+        'SCT' => 14400,
+        'SEST' => 3600,
+        'SGT' => 28800,
+        'SIT' => 28800,
+        'SRT' => -10800,
+        'SST' => -39600,
+        'SYST' => 10800,
+        'SYT' => 7200,
+        'TFT' => 18000,
+        'THAT' => -36000,
+        'TJT' => 18000,
+        'TKT' => -36000,
+        'TMT' => 18000,
+        'TOT' => 46800,
+        'TPT' => 32400,
+        'TRUT' => 36000,
+        'TVT' => 43200,
+        'TWT' => 28800,
+        'UYST' => -7200,
+        'UYT' => -10800,
+        'UZT' => 18000,
+        'VET' => -14400,
+        'VLAST' => 39600,
+        'VLAT' => 36000,
+        'VOST' => 21600,
+        'VUT' => 39600,
+        'WAST' => 7200,
+        'WAT' => 3600,
+        'WDT' => 32400,
+        'WEST' => 3600,
+        'WFT' => 43200,
+        'WIB' => 25200,
+        'WIT' => 32400,
+        'WITA' => 28800,
+        'WKST' => 18000,
+        'WST' => 28800,
+        'YAKST' => 36000,
+        'YAKT' => 32400,
+        'YAPT' => 36000,
+        'YEKST' => 21600,
+        'YEKT' => 18000,
+    ];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Cached PCRE for SimplePie_Parse_Date::$day
-        *
-        * @access protected
-        * @var string
-        */
-       var $day_pcre;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Cached PCRE for Date::$day
+     *
+     * @access protected
+     * @var string
+     */
+    public $day_pcre;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Cached PCRE for SimplePie_Parse_Date::$month
-        *
-        * @access protected
-        * @var string
-        */
-       var $month_pcre;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Cached PCRE for Date::$month
+     *
+     * @access protected
+     * @var string
+     */
+    public $month_pcre;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Array of user-added callback methods
-        *
-        * @access private
-        * @var array
-        */
-       var $built_in = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Array of user-added callback methods
+     *
+     * @access private
+     * @var array
+     */
+    public $built_in = [];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Array of user-added callback methods
-        *
-        * @access private
-        * @var array
-        */
-       var $user = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Array of user-added callback methods
+     *
+     * @access private
+     * @var array
+     */
+    public $user = [];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create new SimplePie_Parse_Date object, and set self::day_pcre,
-        * self::month_pcre, and self::built_in
-        *
-        * @access private
-        */
-       public function __construct()
-       {
-               $this->day_pcre = '(' . implode('|', array_keys($this->day)) . ')';
-               $this->month_pcre = '(' . implode('|', array_keys($this->month)) . ')';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Create new Date object, and set self::day_pcre,
+     * self::month_pcre, and self::built_in
+     *
+     * @access private
+     */
+    public function __construct()
+    {
+        $this->day_pcre = '(' . implode('|', array_keys($this->day)) . ')';
+        $this->month_pcre = '(' . implode('|', array_keys($this->month)) . ')';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                static $cache;
-               if (!isset($cache[get_class($this)]))
-               {
-                       $all_methods = get_class_methods($this);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        static $cache;
+        if (!isset($cache[get_class($this)])) {
+            $all_methods = get_class_methods($this);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        foreach ($all_methods as $method)
-                       {
-                               if (strtolower(substr($method, 0, 5)) === 'date_')
-                               {
-                                       $cache[get_class($this)][] = $method;
-                               }
-                       }
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            foreach ($all_methods as $method) {
+                if (strtolower(substr($method, 0, 5)) === 'date_') {
+                    $cache[get_class($this)][] = $method;
+                }
+            }
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach ($cache[get_class($this)] as $method)
-               {
-                       $this->built_in[] = $method;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        foreach ($cache[get_class($this)] as $method) {
+            $this->built_in[] = $method;
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Get the object
-        *
-        * @access public
-        */
-       public static function get()
-       {
-               static $object;
-               if (!$object)
-               {
-                       $object = new SimplePie_Parse_Date;
-               }
-               return $object;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Get the object
+     *
+     * @access public
+     */
+    public static function get()
+    {
+        static $object;
+        if (!$object) {
+            $object = new Date();
+        }
+        return $object;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse a date
-        *
-        * @final
-        * @access public
-        * @param string $date Date to parse
-        * @return int Timestamp corresponding to date string, or false on failure
-        */
-       public function parse($date)
-       {
-               foreach ($this->user as $method)
-               {
-                       if (($returned = call_user_func($method, $date)) !== false)
-                       {
-                               return $returned;
-                       }
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse a date
+     *
+     * @final
+     * @access public
+     * @param string $date Date to parse
+     * @return int Timestamp corresponding to date string, or false on failure
+     */
+    public function parse($date)
+    {
+        foreach ($this->user as $method) {
+            if (($returned = call_user_func($method, $date)) !== false) {
+                return $returned;
+            }
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach ($this->built_in as $method)
-               {
-                       if (($returned = call_user_func(array($this, $method), $date)) !== false)
-                       {
-                               return $returned;
-                       }
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        foreach ($this->built_in as $method) {
+            if (($returned = call_user_func([$this, $method], $date)) !== false) {
+                return $returned;
+            }
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Add a callback method to parse a date
-        *
-        * @final
-        * @access public
-        * @param callback $callback
-        */
-       public function add_callback($callback)
-       {
-               if (is_callable($callback))
-               {
-                       $this->user[] = $callback;
-               }
-               else
-               {
-                       trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Add a callback method to parse a date
+     *
+     * @final
+     * @access public
+     * @param callable $callback
+     */
+    public function add_callback($callback)
+    {
+        if (is_callable($callback)) {
+            $this->user[] = $callback;
+        } else {
+            trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse a superset of W3C-DTF (allows hyphens and colons to be omitted, as
-        * well as allowing any of upper or lower case "T", horizontal tabs, or
-        * spaces to be used as the time separator (including more than one))
-        *
-        * @access protected
-        * @return int Timestamp
-        */
-       public function date_w3cdtf($date)
-       {
-               static $pcre;
-               if (!$pcre)
-               {
-                       $year = '([0-9]{4})';
-                       $month = $day = $hour = $minute = $second = '([0-9]{2})';
-                       $decimal = '([0-9]*)';
-                       $zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
-                       $pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
-               }
-               if (preg_match($pcre, $date, $match))
-               {
-                       /*
-                       Capturing subpatterns:
-                       1: Year
-                       2: Month
-                       3: Day
-                       4: Hour
-                       5: Minute
-                       6: Second
-                       7: Decimal fraction of a second
-                       8: Zulu
-                       9: Timezone ±
-                       10: Timezone hours
-                       11: Timezone minutes
-                       */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse a superset of W3C-DTF (allows hyphens and colons to be omitted, as
+     * well as allowing any of upper or lower case "T", horizontal tabs, or
+     * spaces to be used as the time separator (including more than one))
+     *
+     * @access protected
+     * @return int Timestamp
+     */
+    public function date_w3cdtf($date)
+    {
+        $pcre = <<<'PCRE'
+            /
+            ^
+            (?P<year>[0-9]{4})
+            (?:
+                -?
+                (?P<month>[0-9]{2})
+                (?:
+                    -?
+                    (?P<day>[0-9]{2})
+                    (?:
+                        [Tt\x09\x20]+
+                        (?P<hour>[0-9]{2})
+                        (?:
+                            :?
+                            (?P<minute>[0-9]{2})
+                            (?:
+                                :?
+                                (?P<second>[0-9]{2})
+                                (?:
+                                    .
+                                    (?P<second_fraction>[0-9]*)
+                                )?
+                            )?
+                        )?
+                        (?:
+                            (?P<zulu>Z)
+                            |   (?P<tz_sign>[+\-])
+                                (?P<tz_hour>[0-9]{1,2})
+                                :?
+                                (?P<tz_minute>[0-9]{1,2})
+                        )
+                    )?
+                )?
+            )?
+            $
+            /x
+PCRE;
+        if (preg_match($pcre, $date, $match)) {
+            // Fill in empty matches and convert to proper types.
+            $year = (int) $match['year'];
+            $month = isset($match['month']) ? (int) $match['month'] : 1;
+            $day = isset($match['day']) ? (int) $match['day'] : 1;
+            $hour = isset($match['hour']) ? (int) $match['hour'] : 0;
+            $minute = isset($match['minute']) ? (int) $match['minute'] : 0;
+            $second = isset($match['second']) ? (int) $match['second'] : 0;
+            $second_fraction = isset($match['second_fraction']) ? ((int) $match['second_fraction']) / (10 ** strlen($match['second_fraction'])) : 0;
+            $tz_sign = ($match['tz_sign'] ?? '') === '-' ? -1 : 1;
+            $tz_hour = isset($match['tz_hour']) ? (int) $match['tz_hour'] : 0;
+            $tz_minute = isset($match['tz_minute']) ? (int) $match['tz_minute'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Fill in empty matches
-                       for ($i = count($match); $i <= 3; $i++)
-                       {
-                               $match[$i] = '1';
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Numeric timezone
+            $timezone = $tz_hour * 3600;
+            $timezone += $tz_minute * 60;
+            $timezone *= $tz_sign;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        for ($i = count($match); $i <= 7; $i++)
-                       {
-                               $match[$i] = '0';
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Convert the number of seconds to an integer, taking decimals into account
+            $second = (int) round($second + $second_fraction);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Numeric timezone
-                       if (isset($match[9]) && $match[9] !== '')
-                       {
-                               $timezone = $match[10] * 3600;
-                               $timezone += $match[11] * 60;
-                               if ($match[9] === '-')
-                               {
-                                       $timezone = 0 - $timezone;
-                               }
-                       }
-                       else
-                       {
-                               $timezone = 0;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            return gmmktime($hour, $minute, $second, $month, $day, $year) - $timezone;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Convert the number of seconds to an integer, taking decimals into account
-                       $second = round((int)$match[6] + (int)$match[7] / (10 ** strlen($match[7])));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Remove RFC822 comments
+     *
+     * @access protected
+     * @param string $data Data to strip comments from
+     * @return string Comment stripped string
+     */
+    public function remove_rfc2822_comments($string)
+    {
+        $string = (string) $string;
+        $position = 0;
+        $length = strlen($string);
+        $depth = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $output = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Remove RFC822 comments
-        *
-        * @access protected
-        * @param string $data Data to strip comments from
-        * @return string Comment stripped string
-        */
-       public function remove_rfc2822_comments($string)
-       {
-               $string = (string) $string;
-               $position = 0;
-               $length = strlen($string);
-               $depth = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        while ($position < $length && ($pos = strpos($string, '(', $position)) !== false) {
+            $output .= substr($string, $position, $pos - $position);
+            $position = $pos + 1;
+            if ($pos === 0 || $string[$pos - 1] !== '\\') {
+                $depth++;
+                while ($depth && $position < $length) {
+                    $position += strcspn($string, '()', $position);
+                    if ($string[$position - 1] === '\\') {
+                        $position++;
+                        continue;
+                    } elseif (isset($string[$position])) {
+                        switch ($string[$position]) {
+                            case '(':
+                                $depth++;
+                                break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $output = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                            case ')':
+                                $depth--;
+                                break;
+                        }
+                        $position++;
+                    } else {
+                        break;
+                    }
+                }
+            } else {
+                $output .= '(';
+            }
+        }
+        $output .= substr($string, $position);
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                while ($position < $length && ($pos = strpos($string, '(', $position)) !== false)
-               {
-                       $output .= substr($string, $position, $pos - $position);
-                       $position = $pos + 1;
-                       if ($pos === 0 || $string[$pos - 1] !== '\\')
-                       {
-                               $depth++;
-                               while ($depth && $position < $length)
-                               {
-                                       $position += strcspn($string, '()', $position);
-                                       if ($string[$position - 1] === '\\')
-                                       {
-                                               $position++;
-                                               continue;
-                                       }
-                                       elseif (isset($string[$position]))
-                                       {
-                                               switch ($string[$position])
-                                               {
-                                                       case '(':
-                                                               $depth++;
-                                                               break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return $output;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        case ')':
-                                                               $depth--;
-                                                               break;
-                                               }
-                                               $position++;
-                                       }
-                                       else
-                                       {
-                                               break;
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               $output .= '(';
-                       }
-               }
-               $output .= substr($string, $position);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse RFC2822's date format
+     *
+     * @access protected
+     * @return int Timestamp
+     */
+    public function date_rfc2822($date)
+    {
+        static $pcre;
+        if (!$pcre) {
+            $wsp = '[\x09\x20]';
+            $fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
+            $optional_fws = $fws . '?';
+            $day_name = $this->day_pcre;
+            $month = $this->month_pcre;
+            $day = '([0-9]{1,2})';
+            $hour = $minute = $second = '([0-9]{2})';
+            $year = '([0-9]{2,4})';
+            $num_zone = '([+\-])([0-9]{2})([0-9]{2})';
+            $character_zone = '([A-Z]{1,5})';
+            $zone = '(?:' . $num_zone . '|' . $character_zone . ')';
+            $pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
+        }
+        if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match)) {
+            /*
+            Capturing subpatterns:
+            1: Day name
+            2: Day
+            3: Month
+            4: Year
+            5: Hour
+            6: Minute
+            7: Second
+            8: Timezone ±
+            9: Timezone hours
+            10: Timezone minutes
+            11: Alphabetic timezone
+            */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return $output;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Find the month number
+            $month = $this->month[strtolower($match[3])];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse RFC2822's date format
-        *
-        * @access protected
-        * @return int Timestamp
-        */
-       public function date_rfc2822($date)
-       {
-               static $pcre;
-               if (!$pcre)
-               {
-                       $wsp = '[\x09\x20]';
-                       $fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
-                       $optional_fws = $fws . '?';
-                       $day_name = $this->day_pcre;
-                       $month = $this->month_pcre;
-                       $day = '([0-9]{1,2})';
-                       $hour = $minute = $second = '([0-9]{2})';
-                       $year = '([0-9]{2,4})';
-                       $num_zone = '([+\-])([0-9]{2})([0-9]{2})';
-                       $character_zone = '([A-Z]{1,5})';
-                       $zone = '(?:' . $num_zone . '|' . $character_zone . ')';
-                       $pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
-               }
-               if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
-               {
-                       /*
-                       Capturing subpatterns:
-                       1: Day name
-                       2: Day
-                       3: Month
-                       4: Year
-                       5: Hour
-                       6: Minute
-                       7: Second
-                       8: Timezone ±
-                       9: Timezone hours
-                       10: Timezone minutes
-                       11: Alphabetic timezone
-                       */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Numeric timezone
+            if ($match[8] !== '') {
+                $timezone = $match[9] * 3600;
+                $timezone += $match[10] * 60;
+                if ($match[8] === '-') {
+                    $timezone = 0 - $timezone;
+                }
+            }
+            // Character timezone
+            elseif (isset($this->timezone[strtoupper($match[11])])) {
+                $timezone = $this->timezone[strtoupper($match[11])];
+            }
+            // Assume everything else to be -0000
+            else {
+                $timezone = 0;
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Find the month number
-                       $month = $this->month[strtolower($match[3])];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Deal with 2/3 digit years
+            if ($match[4] < 50) {
+                $match[4] += 2000;
+            } elseif ($match[4] < 1000) {
+                $match[4] += 1900;
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Numeric timezone
-                       if ($match[8] !== '')
-                       {
-                               $timezone = $match[9] * 3600;
-                               $timezone += $match[10] * 60;
-                               if ($match[8] === '-')
-                               {
-                                       $timezone = 0 - $timezone;
-                               }
-                       }
-                       // Character timezone
-                       elseif (isset($this->timezone[strtoupper($match[11])]))
-                       {
-                               $timezone = $this->timezone[strtoupper($match[11])];
-                       }
-                       // Assume everything else to be -0000
-                       else
-                       {
-                               $timezone = 0;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Second is optional, if it is empty set it to zero
+            if ($match[7] !== '') {
+                $second = $match[7];
+            } else {
+                $second = 0;
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Deal with 2/3 digit years
-                       if ($match[4] < 50)
-                       {
-                               $match[4] += 2000;
-                       }
-                       elseif ($match[4] < 1000)
-                       {
-                               $match[4] += 1900;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            return gmmktime(intval($match[5]), intval($match[6]), intval($second), intval($month), intval($match[2]), intval($match[4])) - $timezone;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Second is optional, if it is empty set it to zero
-                       if ($match[7] !== '')
-                       {
-                               $second = $match[7];
-                       }
-                       else
-                       {
-                               $second = 0;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse RFC850's date format
+     *
+     * @access protected
+     * @return int Timestamp
+     */
+    public function date_rfc850($date)
+    {
+        static $pcre;
+        if (!$pcre) {
+            $space = '[\x09\x20]+';
+            $day_name = $this->day_pcre;
+            $month = $this->month_pcre;
+            $day = '([0-9]{1,2})';
+            $year = $hour = $minute = $second = '([0-9]{2})';
+            $zone = '([A-Z]{1,5})';
+            $pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
+        }
+        if (preg_match($pcre, $date, $match)) {
+            /*
+            Capturing subpatterns:
+            1: Day name
+            2: Day
+            3: Month
+            4: Year
+            5: Hour
+            6: Minute
+            7: Second
+            8: Timezone
+            */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Month
+            $month = $this->month[strtolower($match[3])];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse RFC850's date format
-        *
-        * @access protected
-        * @return int Timestamp
-        */
-       public function date_rfc850($date)
-       {
-               static $pcre;
-               if (!$pcre)
-               {
-                       $space = '[\x09\x20]+';
-                       $day_name = $this->day_pcre;
-                       $month = $this->month_pcre;
-                       $day = '([0-9]{1,2})';
-                       $year = $hour = $minute = $second = '([0-9]{2})';
-                       $zone = '([A-Z]{1,5})';
-                       $pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
-               }
-               if (preg_match($pcre, $date, $match))
-               {
-                       /*
-                       Capturing subpatterns:
-                       1: Day name
-                       2: Day
-                       3: Month
-                       4: Year
-                       5: Hour
-                       6: Minute
-                       7: Second
-                       8: Timezone
-                       */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Character timezone
+            if (isset($this->timezone[strtoupper($match[8])])) {
+                $timezone = $this->timezone[strtoupper($match[8])];
+            }
+            // Assume everything else to be -0000
+            else {
+                $timezone = 0;
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Month
-                       $month = $this->month[strtolower($match[3])];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            // Deal with 2 digit year
+            if ($match[4] < 50) {
+                $match[4] += 2000;
+            } else {
+                $match[4] += 1900;
+            }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Character timezone
-                       if (isset($this->timezone[strtoupper($match[8])]))
-                       {
-                               $timezone = $this->timezone[strtoupper($match[8])];
-                       }
-                       // Assume everything else to be -0000
-                       else
-                       {
-                               $timezone = 0;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Deal with 2 digit year
-                       if ($match[4] < 50)
-                       {
-                               $match[4] += 2000;
-                       }
-                       else
-                       {
-                               $match[4] += 1900;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse C99's asctime()'s date format
+     *
+     * @access protected
+     * @return int Timestamp
+     */
+    public function date_asctime($date)
+    {
+        static $pcre;
+        if (!$pcre) {
+            $space = '[\x09\x20]+';
+            $wday_name = $this->day_pcre;
+            $mon_name = $this->month_pcre;
+            $day = '([0-9]{1,2})';
+            $hour = $sec = $min = '([0-9]{2})';
+            $year = '([0-9]{4})';
+            $terminator = '\x0A?\x00?';
+            $pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
+        }
+        if (preg_match($pcre, $date, $match)) {
+            /*
+            Capturing subpatterns:
+            1: Day name
+            2: Month
+            3: Day
+            4: Hour
+            5: Minute
+            6: Second
+            7: Year
+            */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            $month = $this->month[strtolower($match[2])];
+            return gmmktime((int) $match[4], (int) $match[5], (int) $match[6], $month, (int) $match[3], (int) $match[7]);
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse C99's asctime()'s date format
-        *
-        * @access protected
-        * @return int Timestamp
-        */
-       public function date_asctime($date)
-       {
-               static $pcre;
-               if (!$pcre)
-               {
-                       $space = '[\x09\x20]+';
-                       $wday_name = $this->day_pcre;
-                       $mon_name = $this->month_pcre;
-                       $day = '([0-9]{1,2})';
-                       $hour = $sec = $min = '([0-9]{2})';
-                       $year = '([0-9]{4})';
-                       $terminator = '\x0A?\x00?';
-                       $pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
-               }
-               if (preg_match($pcre, $date, $match))
-               {
-                       /*
-                       Capturing subpatterns:
-                       1: Day name
-                       2: Month
-                       3: Day
-                       4: Hour
-                       5: Minute
-                       6: Second
-                       7: Year
-                       */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $month = $this->month[strtolower($match[2])];
-                       return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]);
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse dates using strtotime()
+     *
+     * @access protected
+     * @return int Timestamp
+     */
+    public function date_strtotime($date)
+    {
+        $strtotime = strtotime($date);
+        if ($strtotime === -1 || $strtotime === false) {
+            return false;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        return $strtotime;
+    }
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse dates using strtotime()
-        *
-        * @access protected
-        * @return int Timestamp
-        */
-       public function date_strtotime($date)
-       {
-               $strtotime = strtotime($date);
-               if ($strtotime === -1 || $strtotime === false)
-               {
-                       return false;
-               }
-
-               return $strtotime;
-       }
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class_alias('SimplePie\Parse\Date', 'SimplePie_Parse_Date');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcParserphpfromrev59140trunksrcwpincludesSimplePieParserphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Parser.php (from rev 59140, trunk/src/wp-includes/SimplePie/Parser.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Parser.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Parser.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,630 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+use SimplePie\XML\Declaration\Parser as DeclarationParser;
+
+/**
+ * Parses XML into something sane
+ *
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_parser_class()}
+ *
+ * @package SimplePie
+ * @subpackage Parsing
+ */
+class Parser implements RegistryAware
+{
+    public $error_code;
+    public $error_string;
+    public $current_line;
+    public $current_column;
+    public $current_byte;
+    public $separator = ' ';
+    public $namespace = [''];
+    public $element = [''];
+    public $xml_base = [''];
+    public $xml_base_explicit = [false];
+    public $xml_lang = [''];
+    public $data = [];
+    public $datas = [[]];
+    public $current_xhtml_construct = -1;
+    public $encoding;
+    protected $registry;
+
+    public function set_registry(\SimplePie\Registry $registry)/* : void */
+    {
+        $this->registry = $registry;
+    }
+
+    public function parse(&$data, $encoding, $url = '')
+    {
+        if (class_exists('DOMXpath') && function_exists('Mf2\parse')) {
+            $doc = new \DOMDocument();
+            @$doc->loadHTML($data);
+            $xpath = new \DOMXpath($doc);
+            // Check for both h-feed and h-entry, as both a feed with no entries
+            // and a list of entries without an h-feed wrapper are both valid.
+            $query = '//*[contains(concat(" ", @class, " "), " h-feed ") or '.
+                'contains(concat(" ", @class, " "), " h-entry ")]';
+            $result = $xpath->query($query);
+            if ($result->length !== 0) {
+                return $this->parse_microformats($data, $url);
+            }
+        }
+
+        // Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character
+        if (strtoupper($encoding) === 'US-ASCII') {
+            $this->encoding = 'UTF-8';
+        } else {
+            $this->encoding = $encoding;
+        }
+
+        // Strip BOM:
+        // UTF-32 Big Endian BOM
+        if (substr($data, 0, 4) === "\x00\x00\xFE\xFF") {
+            $data = substr($data, 4);
+        }
+        // UTF-32 Little Endian BOM
+        elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00") {
+            $data = substr($data, 4);
+        }
+        // UTF-16 Big Endian BOM
+        elseif (substr($data, 0, 2) === "\xFE\xFF") {
+            $data = substr($data, 2);
+        }
+        // UTF-16 Little Endian BOM
+        elseif (substr($data, 0, 2) === "\xFF\xFE") {
+            $data = substr($data, 2);
+        }
+        // UTF-8 BOM
+        elseif (substr($data, 0, 3) === "\xEF\xBB\xBF") {
+            $data = substr($data, 3);
+        }
+
+        if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false) {
+            $declaration = $this->registry->create(DeclarationParser::class, [substr($data, 5, $pos - 5)]);
+            if ($declaration->parse()) {
+                $data = substr($data, $pos + 2);
+                $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' ."\n". $this->declare_html_entities() . $data;
+            } else {
+                $this->error_string = 'SimplePie bug! Please report this!';
+                return false;
+            }
+        }
+
+        $return = true;
+
+        static $xml_is_sane = null;
+        if ($xml_is_sane === null) {
+            $parser_check = xml_parser_create();
+            xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
+            xml_parser_free($parser_check);
+            $xml_is_sane = isset($values[0]['value']);
+        }
+
+        // Create the parser
+        if ($xml_is_sane) {
+            $xml = xml_parser_create_ns($this->encoding, $this->separator);
+            xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
+            xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
+            xml_set_character_data_handler($xml, [$this, 'cdata']);
+            xml_set_element_handler($xml, [$this, 'tag_open'], [$this, 'tag_close']);
+
+            // Parse!
+            $wrapper = @is_writable(sys_get_temp_dir()) ? 'php://temp' : 'php://memory';
+            if (($stream = fopen($wrapper, 'r+')) &&
+                fwrite($stream, $data) &&
+                rewind($stream)) {
+                //Parse by chunks not to use too much memory
+                do {
+                    $stream_data = fread($stream, 1048576);
+                    if (!xml_parse($xml, $stream_data === false ? '' : $stream_data, feof($stream))) {
+                        $this->error_code = xml_get_error_code($xml);
+                        $this->error_string = xml_error_string($this->error_code);
+                        $return = false;
+                        break;
+                    }
+                } while (!feof($stream));
+                fclose($stream);
+            } else {
+                $return = false;
+            }
+
+            $this->current_line = xml_get_current_line_number($xml);
+            $this->current_column = xml_get_current_column_number($xml);
+            $this->current_byte = xml_get_current_byte_index($xml);
+            xml_parser_free($xml);
+            return $return;
+        }
+
+        libxml_clear_errors();
+        $xml = new \XMLReader();
+        $xml->xml($data);
+        while (@$xml->read()) {
+            switch ($xml->nodeType) {
+                case constant('XMLReader::END_ELEMENT'):
+                    if ($xml->namespaceURI !== '') {
+                        $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+                    } else {
+                        $tagName = $xml->localName;
+                    }
+                    $this->tag_close(null, $tagName);
+                    break;
+                case constant('XMLReader::ELEMENT'):
+                    $empty = $xml->isEmptyElement;
+                    if ($xml->namespaceURI !== '') {
+                        $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+                    } else {
+                        $tagName = $xml->localName;
+                    }
+                    $attributes = [];
+                    while ($xml->moveToNextAttribute()) {
+                        if ($xml->namespaceURI !== '') {
+                            $attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+                        } else {
+                            $attrName = $xml->localName;
+                        }
+                        $attributes[$attrName] = $xml->value;
+                    }
+                    $this->tag_open(null, $tagName, $attributes);
+                    if ($empty) {
+                        $this->tag_close(null, $tagName);
+                    }
+                    break;
+                case constant('XMLReader::TEXT'):
+
+                case constant('XMLReader::CDATA'):
+                    $this->cdata(null, $xml->value);
+                    break;
+            }
+        }
+        if ($error = libxml_get_last_error()) {
+            $this->error_code = $error->code;
+            $this->error_string = $error->message;
+            $this->current_line = $error->line;
+            $this->current_column = $error->column;
+            return false;
+        }
+
+        return true;
+    }
+
+    public function get_error_code()
+    {
+        return $this->error_code;
+    }
+
+    public function get_error_string()
+    {
+        return $this->error_string;
+    }
+
+    public function get_current_line()
+    {
+        return $this->current_line;
+    }
+
+    public function get_current_column()
+    {
+        return $this->current_column;
+    }
+
+    public function get_current_byte()
+    {
+        return $this->current_byte;
+    }
+
+    public function get_data()
+    {
+        return $this->data;
+    }
+
+    public function tag_open($parser, $tag, $attributes)
+    {
+        [$this->namespace[], $this->element[]] = $this->split_ns($tag);
+
+        $attribs = [];
+        foreach ($attributes as $name => $value) {
+            [$attrib_namespace, $attribute] = $this->split_ns($name);
+            $attribs[$attrib_namespace][$attribute] = $value;
+        }
+
+        if (isset($attribs[\SimplePie\SimplePie::NAMESPACE_XML]['base'])) {
+            $base = $this->registry->call(Misc::class, 'absolutize_url', [$attribs[\SimplePie\SimplePie::NAMESPACE_XML]['base'], end($this->xml_base)]);
+            if ($base !== false) {
+                $this->xml_base[] = $base;
+                $this->xml_base_explicit[] = true;
+            }
+        } else {
+            $this->xml_base[] = end($this->xml_base);
+            $this->xml_base_explicit[] = end($this->xml_base_explicit);
+        }
+
+        if (isset($attribs[\SimplePie\SimplePie::NAMESPACE_XML]['lang'])) {
+            $this->xml_lang[] = $attribs[\SimplePie\SimplePie::NAMESPACE_XML]['lang'];
+        } else {
+            $this->xml_lang[] = end($this->xml_lang);
+        }
+
+        if ($this->current_xhtml_construct >= 0) {
+            $this->current_xhtml_construct++;
+            if (end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_XHTML) {
+                $this->data['data'] .= '<' . end($this->element);
+                if (isset($attribs[''])) {
+                    foreach ($attribs[''] as $name => $value) {
+                        $this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+                    }
+                }
+                $this->data['data'] .= '>';
+            }
+        } else {
+            $this->datas[] = &$this->data;
+            $this->data = &$this->data['child'][end($this->namespace)][end($this->element)][];
+            $this->data = ['data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang)];
+            if ((end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_ATOM_03 && in_array(end($this->element), ['title', 'tagline', 'copyright', 'info', 'summary', 'content']) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
+            || (end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_ATOM_10 && in_array(end($this->element), ['rights', 'subtitle', 'summary', 'info', 'title', 'content']) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
+            || (end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_RSS_20 && in_array(end($this->element), ['title']))
+            || (end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_RSS_090 && in_array(end($this->element), ['title']))
+            || (end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_RSS_10 && in_array(end($this->element), ['title']))) {
+                $this->current_xhtml_construct = 0;
+            }
+        }
+    }
+
+    public function cdata($parser, $cdata)
+    {
+        if ($this->current_xhtml_construct >= 0) {
+            $this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
+        } else {
+            $this->data['data'] .= $cdata;
+        }
+    }
+
+    public function tag_close($parser, $tag)
+    {
+        if ($this->current_xhtml_construct >= 0) {
+            $this->current_xhtml_construct--;
+            if (end($this->namespace) === \SimplePie\SimplePie::NAMESPACE_XHTML && !in_array(end($this->element), ['area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param'])) {
+                $this->data['data'] .= '</' . end($this->element) . '>';
+            }
+        }
+        if ($this->current_xhtml_construct === -1) {
+            $this->data = &$this->datas[count($this->datas) - 1];
+            array_pop($this->datas);
+        }
+
+        array_pop($this->element);
+        array_pop($this->namespace);
+        array_pop($this->xml_base);
+        array_pop($this->xml_base_explicit);
+        array_pop($this->xml_lang);
+    }
+
+    public function split_ns($string)
+    {
+        static $cache = [];
+        if (!isset($cache[$string])) {
+            if ($pos = strpos($string, $this->separator)) {
+                static $separator_length;
+                if (!$separator_length) {
+                    $separator_length = strlen($this->separator);
+                }
+                $namespace = substr($string, 0, $pos);
+                $local_name = substr($string, $pos + $separator_length);
+                if (strtolower($namespace) === \SimplePie\SimplePie::NAMESPACE_ITUNES) {
+                    $namespace = \SimplePie\SimplePie::NAMESPACE_ITUNES;
+                }
+
+                // Normalize the Media RSS namespaces
+                if ($namespace === \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG ||
+                    $namespace === \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG2 ||
+                    $namespace === \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG3 ||
+                    $namespace === \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG4 ||
+                    $namespace === \SimplePie\SimplePie::NAMESPACE_MEDIARSS_WRONG5) {
+                    $namespace = \SimplePie\SimplePie::NAMESPACE_MEDIARSS;
+                }
+                $cache[$string] = [$namespace, $local_name];
+            } else {
+                $cache[$string] = ['', $string];
+            }
+        }
+        return $cache[$string];
+    }
+
+    private function parse_hcard($data, $category = false)
+    {
+        $name = '';
+        $link = '';
+        // Check if h-card is set and pass that information on in the link.
+        if (isset($data['type']) && in_array('h-card', $data['type'])) {
+            if (isset($data['properties']['name'][0])) {
+                $name = $data['properties']['name'][0];
+            }
+            if (isset($data['properties']['url'][0])) {
+                $link = $data['properties']['url'][0];
+                if ($name === '') {
+                    $name = $link;
+                } else {
+                    // can't have commas in categories.
+                    $name = str_replace(',', '', $name);
+                }
+                $person_tag = $category ? '<span class="person-tag"></span>' : '';
+                return '<a class="h-card" href="'.$link.'">'.$person_tag.$name.'</a>';
+            }
+        }
+        return $data['value'] ?? '';
+    }
+
+    private function parse_microformats(&$data, $url)
+    {
+        $feed_title = '';
+        $feed_author = null;
+        $author_cache = [];
+        $items = [];
+        $entries = [];
+        $mf = \Mf2\parse($data, $url);
+        // First look for an h-feed.
+        $h_feed = [];
+        foreach ($mf['items'] as $mf_item) {
+            if (in_array('h-feed', $mf_item['type'])) {
+                $h_feed = $mf_item;
+                break;
+            }
+            // Also look for h-feed or h-entry in the children of each top level item.
+            if (!isset($mf_item['children'][0]['type'])) {
+                continue;
+            }
+            if (in_array('h-feed', $mf_item['children'][0]['type'])) {
+                $h_feed = $mf_item['children'][0];
+                // In this case the parent of the h-feed may be an h-card, so use it as
+                // the feed_author.
+                if (in_array('h-card', $mf_item['type'])) {
+                    $feed_author = $mf_item;
+                }
+                break;
+            } elseif (in_array('h-entry', $mf_item['children'][0]['type'])) {
+                $entries = $mf_item['children'];
+                // In this case the parent of the h-entry list may be an h-card, so use
+                // it as the feed_author.
+                if (in_array('h-card', $mf_item['type'])) {
+                    $feed_author = $mf_item;
+                }
+                break;
+            }
+        }
+        if (isset($h_feed['children'])) {
+            $entries = $h_feed['children'];
+            // Also set the feed title and store author from the h-feed if available.
+            if (isset($mf['items'][0]['properties']['name'][0])) {
+                $feed_title = $mf['items'][0]['properties']['name'][0];
+            }
+            if (isset($mf['items'][0]['properties']['author'][0])) {
+                $feed_author = $mf['items'][0]['properties']['author'][0];
+            }
+        } elseif (count($entries) === 0) {
+            $entries = $mf['items'];
+        }
+        for ($i = 0; $i < count($entries); $i++) {
+            $entry = $entries[$i];
+            if (in_array('h-entry', $entry['type'])) {
+                $item = [];
+                $title = '';
+                $description = '';
+                if (isset($entry['properties']['url'][0])) {
+                    $link = $entry['properties']['url'][0];
+                    if (isset($link['value'])) {
+                        $link = $link['value'];
+                    }
+                    $item['link'] = [['data' => $link]];
+                }
+                if (isset($entry['properties']['uid'][0])) {
+                    $guid = $entry['properties']['uid'][0];
+                    if (isset($guid['value'])) {
+                        $guid = $guid['value'];
+                    }
+                    $item['guid'] = [['data' => $guid]];
+                }
+                if (isset($entry['properties']['name'][0])) {
+                    $title = $entry['properties']['name'][0];
+                    if (isset($title['value'])) {
+                        $title = $title['value'];
+                    }
+                    $item['title'] = [['data' => $title]];
+                }
+                if (isset($entry['properties']['author'][0]) || isset($feed_author)) {
+                    // author is a special case, it can be plain text or an h-card array.
+                    // If it's plain text it can also be a url that should be followed to
+                    // get the actual h-card.
+                    $author = $entry['properties']['author'][0] ?? $feed_author;
+                    if (!is_string($author)) {
+                        $author = $this->parse_hcard($author);
+                    } elseif (strpos($author, 'http') === 0) {
+                        if (isset($author_cache[$author])) {
+                            $author = $author_cache[$author];
+                        } else {
+                            $mf = \Mf2\fetch($author);
+                            foreach ($mf['items'] as $hcard) {
+                                // Only interested in an h-card by itself in this case.
+                                if (!in_array('h-card', $hcard['type'])) {
+                                    continue;
+                                }
+                                // It must have a url property matching what we fetched.
+                                if (!isset($hcard['properties']['url']) ||
+                                        !(in_array($author, $hcard['properties']['url']))) {
+                                    continue;
+                                }
+                                // Save parse_hcard the trouble of finding the correct url.
+                                $hcard['properties']['url'][0] = $author;
+                                // Cache this h-card for the next h-entry to check.
+                                $author_cache[$author] = $this->parse_hcard($hcard);
+                                $author = $author_cache[$author];
+                                break;
+                            }
+                        }
+                    }
+                    $item['author'] = [['data' => $author]];
+                }
+                if (isset($entry['properties']['photo'][0])) {
+                    // If a photo is also in content, don't need to add it again here.
+                    $content = '';
+                    if (isset($entry['properties']['content'][0]['html'])) {
+                        $content = $entry['properties']['content'][0]['html'];
+                    }
+                    $photo_list = [];
+                    for ($j = 0; $j < count($entry['properties']['photo']); $j++) {
+                        $photo = $entry['properties']['photo'][$j];
+                        if (!empty($photo) && strpos($content, $photo) === false) {
+                            $photo_list[] = $photo;
+                        }
+                    }
+                    // When there's more than one photo show the first and use a lightbox.
+                    // Need a permanent, unique name for the image set, but don't have
+                    // anything unique except for the content itself, so use that.
+                    $count = count($photo_list);
+                    if ($count > 1) {
+                        $image_set_id = preg_replace('/[[:^alnum:]]/', '', $photo_list[0]);
+                        $description = '<p>';
+                        for ($j = 0; $j < $count; $j++) {
+                            $hidden = $j === 0 ? '' : 'class="hidden" ';
+                            $description .= '<a href="'.$photo_list[$j].'" '.$hidden.
+                                'data-lightbox="image-set-'.$image_set_id.'">'.
+                                '<img src="'.$photo_list[$j].'"></a>';
+                        }
+                        $description .= '<br><b>'.$count.' photos</b></p>';
+                    } elseif ($count == 1) {
+                        $description = '<p><img src="'.$photo_list[0].'"></p>';
+                    }
+                }
+                if (isset($entry['properties']['content'][0]['html'])) {
+                    // e-content['value'] is the same as p-name when they are on the same
+                    // element. Use this to replace title with a strip_tags version so
+                    // that alt text from images is not included in the title.
+                    if ($entry['properties']['content'][0]['value'] === $title) {
+                        $title = strip_tags($entry['properties']['content'][0]['html']);
+                        $item['title'] = [['data' => $title]];
+                    }
+                    $description .= $entry['properties']['content'][0]['html'];
+                    if (isset($entry['properties']['in-reply-to'][0])) {
+                        $in_reply_to = '';
+                        if (is_string($entry['properties']['in-reply-to'][0])) {
+                            $in_reply_to = $entry['properties']['in-reply-to'][0];
+                        } elseif (isset($entry['properties']['in-reply-to'][0]['value'])) {
+                            $in_reply_to = $entry['properties']['in-reply-to'][0]['value'];
+                        }
+                        if ($in_reply_to !== '') {
+                            $description .= '<p><span class="in-reply-to"></span> '.
+                                '<a href="'.$in_reply_to.'">'.$in_reply_to.'</a><p>';
+                        }
+                    }
+                    $item['description'] = [['data' => $description]];
+                }
+                if (isset($entry['properties']['category'])) {
+                    $category_csv = '';
+                    // Categories can also contain h-cards.
+                    foreach ($entry['properties']['category'] as $category) {
+                        if ($category_csv !== '') {
+                            $category_csv .= ', ';
+                        }
+                        if (is_string($category)) {
+                            // Can't have commas in categories.
+                            $category_csv .= str_replace(',', '', $category);
+                        } else {
+                            $category_csv .= $this->parse_hcard($category, true);
+                        }
+                    }
+                    $item['category'] = [['data' => $category_csv]];
+                }
+                if (isset($entry['properties']['published'][0])) {
+                    $timestamp = strtotime($entry['properties']['published'][0]);
+                    $pub_date = date('F j Y g:ia', $timestamp).' GMT';
+                    $item['pubDate'] = [['data' => $pub_date]];
+                }
+                // The title and description are set to the empty string to represent
+                // a deleted item (which also makes it an invalid rss item).
+                if (isset($entry['properties']['deleted'][0])) {
+                    $item['title'] = [['data' => '']];
+                    $item['description'] = [['data' => '']];
+                }
+                $items[] = ['child' => ['' => $item]];
+            }
+        }
+        // Mimic RSS data format when storing microformats.
+        $link = [['data' => $url]];
+        $image = '';
+        if (!is_string($feed_author) &&
+                isset($feed_author['properties']['photo'][0])) {
+            $image = [['child' => ['' => ['url' =>
+                [['data' => $feed_author['properties']['photo'][0]]]]]]];
+        }
+        // Use the name given for the h-feed, or get the title from the html.
+        if ($feed_title !== '') {
+            $feed_title = [['data' => htmlspecialchars($feed_title)]];
+        } elseif ($position = strpos($data, '<title>')) {
+            $start = $position < 200 ? 0 : $position - 200;
+            $check = substr($data, $start, 400);
+            $matches = [];
+            if (preg_match('/<title>(.+)<\/title>/', $check, $matches)) {
+                $feed_title = [['data' => htmlspecialchars($matches[1])]];
+            }
+        }
+        $channel = ['channel' => [['child' => ['' =>
+            ['link' => $link, 'image' => $image, 'title' => $feed_title,
+                  'item' => $items]]]]];
+        $rss = [['attribs' => ['' => ['version' => '2.0']],
+                           'child' => ['' => $channel]]];
+        $this->data = ['child' => ['' => ['rss' => $rss]]];
+        return true;
+    }
+
+    private function declare_html_entities()
+    {
+        // This is required because the RSS specification says that entity-encoded
+        // html is allowed, but the xml specification says they must be declared.
+        return '<!DOCTYPE html [ <!ENTITY nbsp "&#x00A0;"> <!ENTITY iexcl "&#x00A1;"> <!ENTITY cent "&#x00A2;"> <!ENTITY pound "&#x00A3;"> <!ENTITY curren "&#x00A4;"> <!ENTITY yen "&#x00A5;"> <!ENTITY brvbar "&#x00A6;"> <!ENTITY sect "&#x00A7;"> <!ENTITY uml "&#x00A8;"> <!ENTITY copy "&#x00A9;"> <!ENTITY ordf "&#x00AA;"> <!ENTITY laquo "&#x00AB;"> <!ENTITY not "&#x00AC;"> <!ENTITY shy "&#x00AD;"> <!ENTITY reg "&#x00AE;"> <!ENTITY macr "&#x00AF;"> <!ENTITY deg "&#x00B0;"> <!ENTITY plusmn "&#x00B1;"> <!ENTITY sup2 "&#x00B2;"> <!ENTITY sup3 "&#x00B3;"> <!ENTITY acute "&#x00B4;&q
 uot;> <!ENTITY micro "&#x00B5;"> <!ENTITY para "&#x00B6;"> <!ENTITY middot "&#x00B7;"> <!ENTITY cedil "&#x00B8;"> <!ENTITY sup1 "&#x00B9;"> <!ENTITY ordm "&#x00BA;"> <!ENTITY raquo "&#x00BB;"> <!ENTITY frac14 "&#x00BC;"> <!ENTITY frac12 "&#x00BD;"> <!ENTITY frac34 "&#x00BE;"> <!ENTITY iquest "&#x00BF;"> <!ENTITY Agrave "&#x00C0;"> <!ENTITY Aacute "&#x00C1;"> <!ENTITY Acirc "&#x00C2;"> <!ENTITY Atilde "&#x00C3;"> <!ENTITY Auml "&#x00C4;"> <!ENTITY Aring "&#x00C5;"> <!ENTITY AElig "&#x00C6;"> <!ENTITY Ccedil "&#x00C7;"> <!ENTITY Egrave "&#x00C8;"> <!ENTITY Eacute "&#x00C9;&quot
 ;> <!ENTITY Ecirc "&#x00CA;"> <!ENTITY Euml "&#x00CB;"> <!ENTITY Igrave "&#x00CC;"> <!ENTITY Iacute "&#x00CD;"> <!ENTITY Icirc "&#x00CE;"> <!ENTITY Iuml "&#x00CF;"> <!ENTITY ETH "&#x00D0;"> <!ENTITY Ntilde "&#x00D1;"> <!ENTITY Ograve "&#x00D2;"> <!ENTITY Oacute "&#x00D3;"> <!ENTITY Ocirc "&#x00D4;"> <!ENTITY Otilde "&#x00D5;"> <!ENTITY Ouml "&#x00D6;"> <!ENTITY times "&#x00D7;"> <!ENTITY Oslash "&#x00D8;"> <!ENTITY Ugrave "&#x00D9;"> <!ENTITY Uacute "&#x00DA;"> <!ENTITY Ucirc "&#x00DB;"> <!ENTITY Uuml "&#x00DC;"> <!ENTITY Yacute "&#x00DD;"> <!ENTITY THORN "&#x00DE;"> 
 <!ENTITY szlig "&#x00DF;"> <!ENTITY agrave "&#x00E0;"> <!ENTITY aacute "&#x00E1;"> <!ENTITY acirc "&#x00E2;"> <!ENTITY atilde "&#x00E3;"> <!ENTITY auml "&#x00E4;"> <!ENTITY aring "&#x00E5;"> <!ENTITY aelig "&#x00E6;"> <!ENTITY ccedil "&#x00E7;"> <!ENTITY egrave "&#x00E8;"> <!ENTITY eacute "&#x00E9;"> <!ENTITY ecirc "&#x00EA;"> <!ENTITY euml "&#x00EB;"> <!ENTITY igrave "&#x00EC;"> <!ENTITY iacute "&#x00ED;"> <!ENTITY icirc "&#x00EE;"> <!ENTITY iuml "&#x00EF;"> <!ENTITY eth "&#x00F0;"> <!ENTITY ntilde "&#x00F1;"> <!ENTITY ograve "&#x00F2;"> <!ENTITY oacute "&#x00F3;"> <
 !ENTITY ocirc "&#x00F4;"> <!ENTITY otilde "&#x00F5;"> <!ENTITY ouml "&#x00F6;"> <!ENTITY divide "&#x00F7;"> <!ENTITY oslash "&#x00F8;"> <!ENTITY ugrave "&#x00F9;"> <!ENTITY uacute "&#x00FA;"> <!ENTITY ucirc "&#x00FB;"> <!ENTITY uuml "&#x00FC;"> <!ENTITY yacute "&#x00FD;"> <!ENTITY thorn "&#x00FE;"> <!ENTITY yuml "&#x00FF;"> <!ENTITY OElig "&#x0152;"> <!ENTITY oelig "&#x0153;"> <!ENTITY Scaron "&#x0160;"> <!ENTITY scaron "&#x0161;"> <!ENTITY Yuml "&#x0178;"> <!ENTITY fnof "&#x0192;"> <!ENTITY circ "&#x02C6;"> <!ENTITY tilde "&#x02DC;"> <!ENTITY Alpha "&#x0391;"> <!ENTITY 
 Beta "&#x0392;"> <!ENTITY Gamma "&#x0393;"> <!ENTITY Epsilon "&#x0395;"> <!ENTITY Zeta "&#x0396;"> <!ENTITY Eta "&#x0397;"> <!ENTITY Theta "&#x0398;"> <!ENTITY Iota "&#x0399;"> <!ENTITY Kappa "&#x039A;"> <!ENTITY Lambda "&#x039B;"> <!ENTITY Mu "&#x039C;"> <!ENTITY Nu "&#x039D;"> <!ENTITY Xi "&#x039E;"> <!ENTITY Omicron "&#x039F;"> <!ENTITY Pi "&#x03A0;"> <!ENTITY Rho "&#x03A1;"> <!ENTITY Sigma "&#x03A3;"> <!ENTITY Tau "&#x03A4;"> <!ENTITY Upsilon "&#x03A5;"> <!ENTITY Phi "&#x03A6;"> <!ENTITY Chi "&#x03A7;"> <!ENTITY Psi "&#x03A8;"> <!ENTITY Omega "&#x03A9;"
 > <!ENTITY alpha "&#x03B1;"> <!ENTITY beta "&#x03B2;"> <!ENTITY gamma "&#x03B3;"> <!ENTITY delta "&#x03B4;"> <!ENTITY epsilon "&#x03B5;"> <!ENTITY zeta "&#x03B6;"> <!ENTITY eta "&#x03B7;"> <!ENTITY theta "&#x03B8;"> <!ENTITY iota "&#x03B9;"> <!ENTITY kappa "&#x03BA;"> <!ENTITY lambda "&#x03BB;"> <!ENTITY mu "&#x03BC;"> <!ENTITY nu "&#x03BD;"> <!ENTITY xi "&#x03BE;"> <!ENTITY omicron "&#x03BF;"> <!ENTITY pi "&#x03C0;"> <!ENTITY rho "&#x03C1;"> <!ENTITY sigmaf "&#x03C2;"> <!ENTITY sigma "&#x03C3;"> <!ENTITY tau "&#x03C4;"> <!ENTITY upsilon "&#x03C5;"> <!ENTITY phi &q
 uot;&#x03C6;"> <!ENTITY chi "&#x03C7;"> <!ENTITY psi "&#x03C8;"> <!ENTITY omega "&#x03C9;"> <!ENTITY thetasym "&#x03D1;"> <!ENTITY upsih "&#x03D2;"> <!ENTITY piv "&#x03D6;"> <!ENTITY ensp "&#x2002;"> <!ENTITY emsp "&#x2003;"> <!ENTITY thinsp "&#x2009;"> <!ENTITY zwnj "&#x200C;"> <!ENTITY zwj "&#x200D;"> <!ENTITY lrm "&#x200E;"> <!ENTITY rlm "&#x200F;"> <!ENTITY ndash "&#x2013;"> <!ENTITY mdash "&#x2014;"> <!ENTITY lsquo "&#x2018;"> <!ENTITY rsquo "&#x2019;"> <!ENTITY sbquo "&#x201A;"> <!ENTITY ldquo "&#x201C;"> <!ENTITY rdquo "&#x201D;"> <!ENTITY bdquo "&#x201E;&quot
 ;> <!ENTITY dagger "&#x2020;"> <!ENTITY Dagger "&#x2021;"> <!ENTITY bull "&#x2022;"> <!ENTITY hellip "&#x2026;"> <!ENTITY permil "&#x2030;"> <!ENTITY prime "&#x2032;"> <!ENTITY Prime "&#x2033;"> <!ENTITY lsaquo "&#x2039;"> <!ENTITY rsaquo "&#x203A;"> <!ENTITY oline "&#x203E;"> <!ENTITY frasl "&#x2044;"> <!ENTITY euro "&#x20AC;"> <!ENTITY image "&#x2111;"> <!ENTITY weierp "&#x2118;"> <!ENTITY real "&#x211C;"> <!ENTITY trade "&#x2122;"> <!ENTITY alefsym "&#x2135;"> <!ENTITY larr "&#x2190;"> <!ENTITY uarr "&#x2191;"> <!ENTITY rarr "&#x2192;"> <!ENTITY darr "&#x2193;"> &l
 t;!ENTITY harr "&#x2194;"> <!ENTITY crarr "&#x21B5;"> <!ENTITY lArr "&#x21D0;"> <!ENTITY uArr "&#x21D1;"> <!ENTITY rArr "&#x21D2;"> <!ENTITY dArr "&#x21D3;"> <!ENTITY hArr "&#x21D4;"> <!ENTITY forall "&#x2200;"> <!ENTITY part "&#x2202;"> <!ENTITY exist "&#x2203;"> <!ENTITY empty "&#x2205;"> <!ENTITY nabla "&#x2207;"> <!ENTITY isin "&#x2208;"> <!ENTITY notin "&#x2209;"> <!ENTITY ni "&#x220B;"> <!ENTITY prod "&#x220F;"> <!ENTITY sum "&#x2211;"> <!ENTITY minus "&#x2212;"> <!ENTITY lowast "&#x2217;"> <!ENTITY radic "&#x221A;"> <!ENTITY prop "&#x221D;"> <!ENTITY infin "&
 amp;#x221E;"> <!ENTITY ang "&#x2220;"> <!ENTITY and "&#x2227;"> <!ENTITY or "&#x2228;"> <!ENTITY cap "&#x2229;"> <!ENTITY cup "&#x222A;"> <!ENTITY int "&#x222B;"> <!ENTITY there4 "&#x2234;"> <!ENTITY sim "&#x223C;"> <!ENTITY cong "&#x2245;"> <!ENTITY asymp "&#x2248;"> <!ENTITY ne "&#x2260;"> <!ENTITY equiv "&#x2261;"> <!ENTITY le "&#x2264;"> <!ENTITY ge "&#x2265;"> <!ENTITY sub "&#x2282;"> <!ENTITY sup "&#x2283;"> <!ENTITY nsub "&#x2284;"> <!ENTITY sube "&#x2286;"> <!ENTITY supe "&#x2287;"> <!ENTITY oplus "&#x2295;"> <!ENTITY otimes "&#x2297;"> <!ENTITY perp &
 quot;&#x22A5;"> <!ENTITY sdot "&#x22C5;"> <!ENTITY lceil "&#x2308;"> <!ENTITY rceil "&#x2309;"> <!ENTITY lfloor "&#x230A;"> <!ENTITY rfloor "&#x230B;"> <!ENTITY lang "&#x2329;"> <!ENTITY rang "&#x232A;"> <!ENTITY loz "&#x25CA;"> <!ENTITY spades "&#x2660;"> <!ENTITY clubs "&#x2663;"> <!ENTITY hearts "&#x2665;"> <!ENTITY diams "&#x2666;"> ]>';
+    }
+}
+
+class_alias('SimplePie\Parser', 'SimplePie_Parser');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcRatingphpfromrev59140trunksrcwpincludesSimplePieRatingphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Rating.php (from rev 59140, trunk/src/wp-includes/SimplePie/Rating.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Rating.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Rating.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,127 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Handles `<media:rating>` or `<itunes:explicit>` tags as defined in Media RSS and iTunes RSS respectively
+ *
+ * Used by {@see \SimplePie\Enclosure::get_rating()} and {@see \SimplePie\Enclosure::get_ratings()}
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_rating_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Rating
+{
+    /**
+     * Rating scheme
+     *
+     * @var string
+     * @see get_scheme()
+     */
+    public $scheme;
+
+    /**
+     * Rating value
+     *
+     * @var string
+     * @see get_value()
+     */
+    public $value;
+
+    /**
+     * Constructor, used to input the data
+     *
+     * For documentation on all the parameters, see the corresponding
+     * properties and their accessors
+     */
+    public function __construct($scheme = null, $value = null)
+    {
+        $this->scheme = $scheme;
+        $this->value = $value;
+    }
+
+    /**
+     * String-ified version
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        // There is no $this->data here
+        return md5(serialize($this));
+    }
+
+    /**
+     * Get the organizational scheme for the rating
+     *
+     * @return string|null
+     */
+    public function get_scheme()
+    {
+        if ($this->scheme !== null) {
+            return $this->scheme;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the value of the rating
+     *
+     * @return string|null
+     */
+    public function get_value()
+    {
+        if ($this->value !== null) {
+            return $this->value;
+        }
+
+        return null;
+    }
+}
+
+class_alias('SimplePie\Rating', 'SimplePie_Rating');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcRegistryphpfromrev59140trunksrcwpincludesSimplePieRegistryphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Registry.php (from rev 59140, trunk/src/wp-includes/SimplePie/Registry.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Registry.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Registry.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,271 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+use SimplePie\Content\Type\Sniffer;
+use SimplePie\Parse\Date;
+use SimplePie\XML\Declaration\Parser as DeclarationParser;
+
+/**
+ * Handles creating objects and calling methods
+ *
+ * Access this via {@see \SimplePie\SimplePie::get_registry()}
+ *
+ * @package SimplePie
+ */
+class Registry
+{
+    /**
+     * Default class mapping
+     *
+     * Overriding classes *must* subclass these.
+     *
+     * @var array<class-string, class-string>
+     */
+    protected $default = [
+        Cache::class => Cache::class,
+        Locator::class => Locator::class,
+        Parser::class => Parser::class,
+        File::class => File::class,
+        Sanitize::class => Sanitize::class,
+        Item::class => Item::class,
+        Author::class => Author::class,
+        Category::class => Category::class,
+        Enclosure::class => Enclosure::class,
+        Caption::class => Caption::class,
+        Copyright::class => Copyright::class,
+        Credit::class => Credit::class,
+        Rating::class => Rating::class,
+        Restriction::class => Restriction::class,
+        Sniffer::class => Sniffer::class,
+        Source::class => Source::class,
+        Misc::class => Misc::class,
+        DeclarationParser::class => DeclarationParser::class,
+        Date::class => Date::class,
+    ];
+
+    /**
+     * Class mapping
+     *
+     * @see register()
+     * @var array
+     */
+    protected $classes = [];
+
+    /**
+     * Legacy classes
+     *
+     * @see register()
+     * @var array<class-string>
+     */
+    protected $legacy = [];
+
+    /**
+     * Legacy types
+     *
+     * @see register()
+     * @var array<string, class-string>
+     */
+    private $legacyTypes = [
+        'Cache' => Cache::class,
+        'Locator' => Locator::class,
+        'Parser' => Parser::class,
+        'File' => File::class,
+        'Sanitize' => Sanitize::class,
+        'Item' => Item::class,
+        'Author' => Author::class,
+        'Category' => Category::class,
+        'Enclosure' => Enclosure::class,
+        'Caption' => Caption::class,
+        'Copyright' => Copyright::class,
+        'Credit' => Credit::class,
+        'Rating' => Rating::class,
+        'Restriction' => Restriction::class,
+        'Content_Type_Sniffer' => Sniffer::class,
+        'Source' => Source::class,
+        'Misc' => Misc::class,
+        'XML_Declaration_Parser' => DeclarationParser::class,
+        'Parse_Date' => Date::class,
+    ];
+
+    /**
+     * Constructor
+     *
+     * No-op
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Register a class
+     *
+     * @param string $type See {@see $default} for names
+     * @param class-string $class Class name, must subclass the corresponding default
+     * @param bool $legacy Whether to enable legacy support for this class
+     * @return bool Successfulness
+     */
+    public function register($type, $class, $legacy = false)
+    {
+        if (array_key_exists($type, $this->legacyTypes)) {
+            // trigger_error(sprintf('"%s"(): Using argument #1 ($type) with value "%s" is deprecated since SimplePie 1.8.0, use class-string "%s" instead.', __METHOD__, $type, $this->legacyTypes[$type]), \E_USER_DEPRECATED);
+
+            $type = $this->legacyTypes[$type];
+        }
+
+        if (!array_key_exists($type, $this->default)) {
+            return false;
+        }
+
+        if (!class_exists($class)) {
+            return false;
+        }
+
+        /** @var string */
+        $base_class = $this->default[$type];
+
+        if (!is_subclass_of($class, $base_class)) {
+            return false;
+        }
+
+        $this->classes[$type] = $class;
+
+        if ($legacy) {
+            $this->legacy[] = $class;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the class registered for a type
+     *
+     * Where possible, use {@see create()} or {@see call()} instead
+     *
+     * @template T
+     * @param class-string<T> $type
+     * @return class-string<T>|null
+     */
+    public function get_class($type)
+    {
+        if (array_key_exists($type, $this->legacyTypes)) {
+            // trigger_error(sprintf('"%s"(): Using argument #1 ($type) with value "%s" is deprecated since SimplePie 1.8.0, use class-string "%s" instead.', __METHOD__, $type, $this->legacyTypes[$type]), \E_USER_DEPRECATED);
+
+            $type = $this->legacyTypes[$type];
+        }
+
+        if (!array_key_exists($type, $this->default)) {
+            return null;
+        }
+
+        $class = $this->default[$type];
+
+        if (array_key_exists($type, $this->classes)) {
+            $class = $this->classes[$type];
+        }
+
+        return $class;
+    }
+
+    /**
+     * Create a new instance of a given type
+     *
+     * @template T class-string $type
+     * @param class-string<T> $type
+     * @param array $parameters Parameters to pass to the constructor
+     * @return T Instance of class
+     */
+    public function &create($type, $parameters = [])
+    {
+        $class = $this->get_class($type);
+
+        if (!method_exists($class, '__construct')) {
+            $instance = new $class();
+        } else {
+            $reflector = new \ReflectionClass($class);
+            $instance = $reflector->newInstanceArgs($parameters);
+        }
+
+        if ($instance instanceof RegistryAware) {
+            $instance->set_registry($this);
+        } elseif (method_exists($instance, 'set_registry')) {
+            trigger_error(sprintf('Using the method "set_registry()" without implementing "%s" is deprecated since SimplePie 1.8.0, implement "%s" in "%s".', RegistryAware::class, RegistryAware::class, $class), \E_USER_DEPRECATED);
+            $instance->set_registry($this);
+        }
+        return $instance;
+    }
+
+    /**
+     * Call a static method for a type
+     *
+     * @param class-string $type
+     * @param string $method
+     * @param array $parameters
+     * @return mixed
+     */
+    public function &call($type, $method, $parameters = [])
+    {
+        $class = $this->get_class($type);
+
+        if (in_array($class, $this->legacy)) {
+            switch ($type) {
+                case Cache::class:
+                    // For backwards compatibility with old non-static
+                    // Cache::create() methods in PHP < 8.0.
+                    // No longer supported as of PHP 8.0.
+                    if ($method === 'get_handler') {
+                        $result = @call_user_func_array([$class, 'create'], $parameters);
+                        return $result;
+                    }
+                    break;
+            }
+        }
+
+        $result = call_user_func_array([$class, $method], $parameters);
+        return $result;
+    }
+}
+
+class_alias('SimplePie\Registry', 'SimplePie_Registry');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcRegistryAwarephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/SimplePie/src/RegistryAware.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/RegistryAware.php                             (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/RegistryAware.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,64 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2022 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Handles the injection of Registry into other class
+ *
+ * {@see \SimplePie\SimplePie::get_registry()}
+ *
+ * @package SimplePie
+ */
+interface RegistryAware
+{
+    /**
+     * Set the Registry into the class
+     *
+     * @param Registry $registry
+     *
+     * @return void
+     */
+    public function set_registry(Registry $registry)/* : void */;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/SimplePie/src/RegistryAware.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesSimplePiesrcRestrictionphpfromrev59140trunksrcwpincludesSimplePieRestrictionphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Restriction.php (from rev 59140, trunk/src/wp-includes/SimplePie/Restriction.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Restriction.php                               (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Restriction.php 2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,150 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Handles `<media:restriction>` as defined in Media RSS
+ *
+ * Used by {@see \SimplePie\Enclosure::get_restriction()} and {@see \SimplePie\Enclosure::get_restrictions()}
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_restriction_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Restriction
+{
+    /**
+     * Relationship ('allow'/'deny')
+     *
+     * @var string
+     * @see get_relationship()
+     */
+    public $relationship;
+
+    /**
+     * Type of restriction
+     *
+     * @var string
+     * @see get_type()
+     */
+    public $type;
+
+    /**
+     * Restricted values
+     *
+     * @var string
+     * @see get_value()
+     */
+    public $value;
+
+    /**
+     * Constructor, used to input the data
+     *
+     * For documentation on all the parameters, see the corresponding
+     * properties and their accessors
+     */
+    public function __construct($relationship = null, $type = null, $value = null)
+    {
+        $this->relationship = $relationship;
+        $this->type = $type;
+        $this->value = $value;
+    }
+
+    /**
+     * String-ified version
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        // There is no $this->data here
+        return md5(serialize($this));
+    }
+
+    /**
+     * Get the relationship
+     *
+     * @return string|null Either 'allow' or 'deny'
+     */
+    public function get_relationship()
+    {
+        if ($this->relationship !== null) {
+            return $this->relationship;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the type
+     *
+     * @return string|null
+     */
+    public function get_type()
+    {
+        if ($this->type !== null) {
+            return $this->type;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the list of restricted things
+     *
+     * @return string|null
+     */
+    public function get_value()
+    {
+        if ($this->value !== null) {
+            return $this->value;
+        }
+
+        return null;
+    }
+}
+
+class_alias('SimplePie\Restriction', 'SimplePie_Restriction');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcSanitizephpfromrev59140trunksrcwpincludesSimplePieSanitizephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Sanitize.php (from rev 59140, trunk/src/wp-includes/SimplePie/Sanitize.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Sanitize.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Sanitize.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,656 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+use InvalidArgumentException;
+use SimplePie\Cache\Base;
+use SimplePie\Cache\BaseDataCache;
+use SimplePie\Cache\CallableNameFilter;
+use SimplePie\Cache\DataCache;
+use SimplePie\Cache\NameFilter;
+
+/**
+ * Used for data cleanup and post-processing
+ *
+ *
+ * This class can be overloaded with {@see \SimplePie\SimplePie::set_sanitize_class()}
+ *
+ * @package SimplePie
+ * @todo Move to using an actual HTML parser (this will allow tags to be properly stripped, and to switch between HTML and XHTML), this will also make it easier to shorten a string while preserving HTML tags
+ */
+class Sanitize implements RegistryAware
+{
+    // Private vars
+    public $base;
+
+    // Options
+    public $remove_div = true;
+    public $image_handler = '';
+    public $strip_htmltags = ['base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'];
+    public $encode_instead_of_strip = false;
+    public $strip_attributes = ['bgsound', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'];
+    public $rename_attributes = [];
+    public $add_attributes = ['audio' => ['preload' => 'none'], 'iframe' => ['sandbox' => 'allow-scripts allow-same-origin'], 'video' => ['preload' => 'none']];
+    public $strip_comments = false;
+    public $output_encoding = 'UTF-8';
+    public $enable_cache = true;
+    public $cache_location = './cache';
+    public $cache_name_function = 'md5';
+
+    /**
+     * @var NameFilter
+     */
+    private $cache_namefilter;
+    public $timeout = 10;
+    public $useragent = '';
+    public $force_fsockopen = false;
+    public $replace_url_attributes = null;
+    public $registry;
+
+    /**
+     * @var DataCache|null
+     */
+    private $cache = null;
+
+    /**
+     * @var int Cache duration (in seconds)
+     */
+    private $cache_duration = 3600;
+
+    /**
+     * List of domains for which to force HTTPS.
+     * @see \SimplePie\Sanitize::set_https_domains()
+     * Array is a tree split at DNS levels. Example:
+     * array('biz' => true, 'com' => array('example' => true), 'net' => array('example' => array('www' => true)))
+     */
+    public $https_domains = [];
+
+    public function __construct()
+    {
+        // Set defaults
+        $this->set_url_replacements(null);
+    }
+
+    public function remove_div($enable = true)
+    {
+        $this->remove_div = (bool) $enable;
+    }
+
+    public function set_image_handler($page = false)
+    {
+        if ($page) {
+            $this->image_handler = (string) $page;
+        } else {
+            $this->image_handler = false;
+        }
+    }
+
+    public function set_registry(\SimplePie\Registry $registry)/* : void */
+    {
+        $this->registry = $registry;
+    }
+
+    public function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie\Cache', ?DataCache $cache = null)
+    {
+        if (isset($enable_cache)) {
+            $this->enable_cache = (bool) $enable_cache;
+        }
+
+        if ($cache_location) {
+            $this->cache_location = (string) $cache_location;
+        }
+
+        if (!is_string($cache_name_function) && !is_object($cache_name_function) && !$cache_name_function instanceof NameFilter) {
+            throw new InvalidArgumentException(sprintf(
+                '%s(): Argument #3 ($cache_name_function) must be of type %s',
+                __METHOD__,
+                NameFilter::class
+            ), 1);
+        }
+
+        // BC: $cache_name_function could be a callable as string
+        if (is_string($cache_name_function)) {
+            // trigger_error(sprintf('Providing $cache_name_function as string in "%s()" is deprecated since SimplePie 1.8.0, provide as "%s" instead.', __METHOD__, NameFilter::class), \E_USER_DEPRECATED);
+            $this->cache_name_function = (string) $cache_name_function;
+
+            $cache_name_function = new CallableNameFilter($cache_name_function);
+        }
+
+        $this->cache_namefilter = $cache_name_function;
+
+        if ($cache !== null) {
+            $this->cache = $cache;
+        }
+    }
+
+    public function pass_file_data($file_class = 'SimplePie\File', $timeout = 10, $useragent = '', $force_fsockopen = false)
+    {
+        if ($timeout) {
+            $this->timeout = (string) $timeout;
+        }
+
+        if ($useragent) {
+            $this->useragent = (string) $useragent;
+        }
+
+        if ($force_fsockopen) {
+            $this->force_fsockopen = (string) $force_fsockopen;
+        }
+    }
+
+    public function strip_htmltags($tags = ['base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'])
+    {
+        if ($tags) {
+            if (is_array($tags)) {
+                $this->strip_htmltags = $tags;
+            } else {
+                $this->strip_htmltags = explode(',', $tags);
+            }
+        } else {
+            $this->strip_htmltags = false;
+        }
+    }
+
+    public function encode_instead_of_strip($encode = false)
+    {
+        $this->encode_instead_of_strip = (bool) $encode;
+    }
+
+    public function rename_attributes($attribs = [])
+    {
+        if ($attribs) {
+            if (is_array($attribs)) {
+                $this->rename_attributes = $attribs;
+            } else {
+                $this->rename_attributes = explode(',', $attribs);
+            }
+        } else {
+            $this->rename_attributes = false;
+        }
+    }
+
+    public function strip_attributes($attribs = ['bgsound', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'])
+    {
+        if ($attribs) {
+            if (is_array($attribs)) {
+                $this->strip_attributes = $attribs;
+            } else {
+                $this->strip_attributes = explode(',', $attribs);
+            }
+        } else {
+            $this->strip_attributes = false;
+        }
+    }
+
+    public function add_attributes($attribs = ['audio' => ['preload' => 'none'], 'iframe' => ['sandbox' => 'allow-scripts allow-same-origin'], 'video' => ['preload' => 'none']])
+    {
+        if ($attribs) {
+            if (is_array($attribs)) {
+                $this->add_attributes = $attribs;
+            } else {
+                $this->add_attributes = explode(',', $attribs);
+            }
+        } else {
+            $this->add_attributes = false;
+        }
+    }
+
+    public function strip_comments($strip = false)
+    {
+        $this->strip_comments = (bool) $strip;
+    }
+
+    public function set_output_encoding($encoding = 'UTF-8')
+    {
+        $this->output_encoding = (string) $encoding;
+    }
+
+    /**
+     * Set element/attribute key/value pairs of HTML attributes
+     * containing URLs that need to be resolved relative to the feed
+     *
+     * Defaults to |a|@href, |area|@href, |audio|@src, |blockquote|@cite,
+     * |del|@cite, |form|@action, |img|@longdesc, |img|@src, |input|@src,
+     * |ins|@cite, |q|@cite, |source|@src, |video|@src
+     *
+     * @since 1.0
+     * @param array|null $element_attribute Element/attribute key/value pairs, null for default
+     */
+    public function set_url_replacements($element_attribute = null)
+    {
+        if ($element_attribute === null) {
+            $element_attribute = [
+                'a' => 'href',
+                'area' => 'href',
+                'audio' => 'src',
+                'blockquote' => 'cite',
+                'del' => 'cite',
+                'form' => 'action',
+                'img' => [
+                    'longdesc',
+                    'src'
+                ],
+                'input' => 'src',
+                'ins' => 'cite',
+                'q' => 'cite',
+                'source' => 'src',
+                'video' => [
+                    'poster',
+                    'src'
+                ]
+            ];
+        }
+        $this->replace_url_attributes = (array) $element_attribute;
+    }
+
+    /**
+     * Set the list of domains for which to force HTTPS.
+     * @see \SimplePie\Misc::https_url()
+     * Example array('biz', 'example.com', 'example.org', 'www.example.net');
+     */
+    public function set_https_domains($domains)
+    {
+        $this->https_domains = [];
+        foreach ($domains as $domain) {
+            $domain = trim($domain, ". \t\n\r\0\x0B");
+            $segments = array_reverse(explode('.', $domain));
+            $node = &$this->https_domains;
+            foreach ($segments as $segment) {//Build a tree
+                if ($node === true) {
+                    break;
+                }
+                if (!isset($node[$segment])) {
+                    $node[$segment] = [];
+                }
+                $node = &$node[$segment];
+            }
+            $node = true;
+        }
+    }
+
+    /**
+     * Check if the domain is in the list of forced HTTPS.
+     */
+    protected function is_https_domain($domain)
+    {
+        $domain = trim($domain, '. ');
+        $segments = array_reverse(explode('.', $domain));
+        $node = &$this->https_domains;
+        foreach ($segments as $segment) {//Explore the tree
+            if (isset($node[$segment])) {
+                $node = &$node[$segment];
+            } else {
+                break;
+            }
+        }
+        return $node === true;
+    }
+
+    /**
+     * Force HTTPS for selected Web sites.
+     */
+    public function https_url($url)
+    {
+        return (strtolower(substr($url, 0, 7)) === 'http://') &&
+            $this->is_https_domain(parse_url($url, PHP_URL_HOST)) ?
+            substr_replace($url, 's', 4, 0) : //Add the 's' to HTTPS
+            $url;
+    }
+
+    public function sanitize($data, $type, $base = '')
+    {
+        $data = trim($data);
+        if ($data !== '' || $type & \SimplePie\SimplePie::CONSTRUCT_IRI) {
+            if ($type & \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML) {
+                if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . \SimplePie\SimplePie::PCRE_HTML_ATTRIBUTE . '>)/', $data)) {
+                    $type |= \SimplePie\SimplePie::CONSTRUCT_HTML;
+                } else {
+                    $type |= \SimplePie\SimplePie::CONSTRUCT_TEXT;
+                }
+            }
+
+            if ($type & \SimplePie\SimplePie::CONSTRUCT_BASE64) {
+                $data = base64_decode($data);
+            }
+
+            if ($type & (\SimplePie\SimplePie::CONSTRUCT_HTML | \SimplePie\SimplePie::CONSTRUCT_XHTML)) {
+                if (!class_exists('DOMDocument')) {
+                    throw new \SimplePie\Exception('DOMDocument not found, unable to use sanitizer');
+                }
+                $document = new \DOMDocument();
+                $document->encoding = 'UTF-8';
+
+                $data = $this->preprocess($data, $type);
+
+                set_error_handler(['SimplePie\Misc', 'silence_errors']);
+                $document->loadHTML($data);
+                restore_error_handler();
+
+                $xpath = new \DOMXPath($document);
+
+                // Strip comments
+                if ($this->strip_comments) {
+                    $comments = $xpath->query('//comment()');
+
+                    foreach ($comments as $comment) {
+                        $comment->parentNode->removeChild($comment);
+                    }
+                }
+
+                // Strip out HTML tags and attributes that might cause various security problems.
+                // Based on recommendations by Mark Pilgrim at:
+                // http://diveintomark.org/archives/2003/06/12/how_to_consume_rss_safely
+                if ($this->strip_htmltags) {
+                    foreach ($this->strip_htmltags as $tag) {
+                        $this->strip_tag($tag, $document, $xpath, $type);
+                    }
+                }
+
+                if ($this->rename_attributes) {
+                    foreach ($this->rename_attributes as $attrib) {
+                        $this->rename_attr($attrib, $xpath);
+                    }
+                }
+
+                if ($this->strip_attributes) {
+                    foreach ($this->strip_attributes as $attrib) {
+                        $this->strip_attr($attrib, $xpath);
+                    }
+                }
+
+                if ($this->add_attributes) {
+                    foreach ($this->add_attributes as $tag => $valuePairs) {
+                        $this->add_attr($tag, $valuePairs, $document);
+                    }
+                }
+
+                // Replace relative URLs
+                $this->base = $base;
+                foreach ($this->replace_url_attributes as $element => $attributes) {
+                    $this->replace_urls($document, $element, $attributes);
+                }
+
+                // If image handling (caching, etc.) is enabled, cache and rewrite all the image tags.
+                if (isset($this->image_handler) && ((string) $this->image_handler) !== '' && $this->enable_cache) {
+                    $images = $document->getElementsByTagName('img');
+
+                    foreach ($images as $img) {
+                        if ($img->hasAttribute('src')) {
+                            $image_url = $this->cache_namefilter->filter($img->getAttribute('src'));
+                            $cache = $this->get_cache($image_url);
+
+                            if ($cache->get_data($image_url, false)) {
+                                $img->setAttribute('src', $this->image_handler . $image_url);
+                            } else {
+                                $file = $this->registry->create(File::class, [$img->getAttribute('src'), $this->timeout, 5, ['X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']], $this->useragent, $this->force_fsockopen]);
+                                $headers = $file->headers;
+
+                                if ($file->success && ($file->method & \SimplePie\SimplePie::FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300))) {
+                                    if ($cache->set_data($image_url, ['headers' => $file->headers, 'body' => $file->body], $this->cache_duration)) {
+                                        $img->setAttribute('src', $this->image_handler . $image_url);
+                                    } else {
+                                        trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Get content node
+                $div = $document->getElementsByTagName('body')->item(0)->firstChild;
+                // Finally, convert to a HTML string
+                $data = trim($document->saveHTML($div));
+
+                if ($this->remove_div) {
+                    $data = preg_replace('/^<div' . \SimplePie\SimplePie::PCRE_XML_ATTRIBUTE . '>/', '', $data);
+                    $data = preg_replace('/<\/div>$/', '', $data);
+                } else {
+                    $data = preg_replace('/^<div' . \SimplePie\SimplePie::PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+                }
+
+                $data = str_replace('</source>', '', $data);
+            }
+
+            if ($type & \SimplePie\SimplePie::CONSTRUCT_IRI) {
+                $absolute = $this->registry->call(Misc::class, 'absolutize_url', [$data, $base]);
+                if ($absolute !== false) {
+                    $data = $absolute;
+                }
+            }
+
+            if ($type & (\SimplePie\SimplePie::CONSTRUCT_TEXT | \SimplePie\SimplePie::CONSTRUCT_IRI)) {
+                $data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
+            }
+
+            if ($this->output_encoding !== 'UTF-8') {
+                $data = $this->registry->call(Misc::class, 'change_encoding', [$data, 'UTF-8', $this->output_encoding]);
+            }
+        }
+        return $data;
+    }
+
+    protected function preprocess($html, $type)
+    {
+        $ret = '';
+        $html = preg_replace('%</?(?:html|body)[^>]*?'.'>%is', '', $html);
+        if ($type & ~\SimplePie\SimplePie::CONSTRUCT_XHTML) {
+            // Atom XHTML constructs are wrapped with a div by default
+            // Note: No protection if $html contains a stray </div>!
+            $html = '<div>' . $html . '</div>';
+            $ret .= '<!DOCTYPE html>';
+            $content_type = 'text/html';
+        } else {
+            $ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+            $content_type = 'application/xhtml+xml';
+        }
+
+        $ret .= '<html><head>';
+        $ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
+        $ret .= '</head><body>' . $html . '</body></html>';
+        return $ret;
+    }
+
+    public function replace_urls($document, $tag, $attributes)
+    {
+        if (!is_array($attributes)) {
+            $attributes = [$attributes];
+        }
+
+        if (!is_array($this->strip_htmltags) || !in_array($tag, $this->strip_htmltags)) {
+            $elements = $document->getElementsByTagName($tag);
+            foreach ($elements as $element) {
+                foreach ($attributes as $attribute) {
+                    if ($element->hasAttribute($attribute)) {
+                        $value = $this->registry->call(Misc::class, 'absolutize_url', [$element->getAttribute($attribute), $this->base]);
+                        if ($value !== false) {
+                            $value = $this->https_url($value);
+                            $element->setAttribute($attribute, $value);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public function do_strip_htmltags($match)
+    {
+        if ($this->encode_instead_of_strip) {
+            if (isset($match[4]) && !in_array(strtolower($match[1]), ['script', 'style'])) {
+                $match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
+                $match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
+                return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
+            } else {
+                return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
+            }
+        } elseif (isset($match[4]) && !in_array(strtolower($match[1]), ['script', 'style'])) {
+            return $match[4];
+        } else {
+            return '';
+        }
+    }
+
+    protected function strip_tag($tag, $document, $xpath, $type)
+    {
+        $elements = $xpath->query('body//' . $tag);
+        if ($this->encode_instead_of_strip) {
+            foreach ($elements as $element) {
+                $fragment = $document->createDocumentFragment();
+
+                // For elements which aren't script or style, include the tag itself
+                if (!in_array($tag, ['script', 'style'])) {
+                    $text = '<' . $tag;
+                    if ($element->hasAttributes()) {
+                        $attrs = [];
+                        foreach ($element->attributes as $name => $attr) {
+                            $value = $attr->value;
+
+                            // In XHTML, empty values should never exist, so we repeat the value
+                            if (empty($value) && ($type & \SimplePie\SimplePie::CONSTRUCT_XHTML)) {
+                                $value = $name;
+                            }
+                            // For HTML, empty is fine
+                            elseif (empty($value) && ($type & \SimplePie\SimplePie::CONSTRUCT_HTML)) {
+                                $attrs[] = $name;
+                                continue;
+                            }
+
+                            // Standard attribute text
+                            $attrs[] = $name . '="' . $attr->value . '"';
+                        }
+                        $text .= ' ' . implode(' ', $attrs);
+                    }
+                    $text .= '>';
+                    $fragment->appendChild(new \DOMText($text));
+                }
+
+                $number = $element->childNodes->length;
+                for ($i = $number; $i > 0; $i--) {
+                    $child = $element->childNodes->item(0);
+                    $fragment->appendChild($child);
+                }
+
+                if (!in_array($tag, ['script', 'style'])) {
+                    $fragment->appendChild(new \DOMText('</' . $tag . '>'));
+                }
+
+                $element->parentNode->replaceChild($fragment, $element);
+            }
+
+            return;
+        } elseif (in_array($tag, ['script', 'style'])) {
+            foreach ($elements as $element) {
+                $element->parentNode->removeChild($element);
+            }
+
+            return;
+        } else {
+            foreach ($elements as $element) {
+                $fragment = $document->createDocumentFragment();
+                $number = $element->childNodes->length;
+                for ($i = $number; $i > 0; $i--) {
+                    $child = $element->childNodes->item(0);
+                    $fragment->appendChild($child);
+                }
+
+                $element->parentNode->replaceChild($fragment, $element);
+            }
+        }
+    }
+
+    protected function strip_attr($attrib, $xpath)
+    {
+        $elements = $xpath->query('//*[@' . $attrib . ']');
+
+        foreach ($elements as $element) {
+            $element->removeAttribute($attrib);
+        }
+    }
+
+    protected function rename_attr($attrib, $xpath)
+    {
+        $elements = $xpath->query('//*[@' . $attrib . ']');
+
+        foreach ($elements as $element) {
+            $element->setAttribute('data-sanitized-' . $attrib, $element->getAttribute($attrib));
+            $element->removeAttribute($attrib);
+        }
+    }
+
+    protected function add_attr($tag, $valuePairs, $document)
+    {
+        $elements = $document->getElementsByTagName($tag);
+        foreach ($elements as $element) {
+            foreach ($valuePairs as $attrib => $value) {
+                $element->setAttribute($attrib, $value);
+            }
+        }
+    }
+
+    /**
+     * Get a DataCache
+     *
+     * @param string $image_url Only needed for BC, can be removed in SimplePie 2.0.0
+     *
+     * @return DataCache
+     */
+    private function get_cache($image_url = '')
+    {
+        if ($this->cache === null) {
+            // @trigger_error(sprintf('Not providing as PSR-16 cache implementation is deprecated since SimplePie 1.8.0, please use "SimplePie\SimplePie::set_cache()".'), \E_USER_DEPRECATED);
+            $cache = $this->registry->call(Cache::class, 'get_handler', [
+                $this->cache_location,
+                $image_url,
+                Base::TYPE_IMAGE
+            ]);
+
+            return new BaseDataCache($cache);
+        }
+
+        return $this->cache;
+    }
+}
+
+class_alias('SimplePie\Sanitize', 'SimplePie_Sanitize');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcSimplePiephpfromrev59138trunksrcwpincludesclasssimplepiephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/SimplePie.php (from rev 59138, trunk/src/wp-includes/class-simplepie.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/SimplePie.php                         (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/SimplePie.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,3226 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+use InvalidArgumentException;
+use Psr\SimpleCache\CacheInterface;
+use SimplePie\Cache\Base;
+use SimplePie\Cache\BaseDataCache;
+use SimplePie\Cache\CallableNameFilter;
+use SimplePie\Cache\DataCache;
+use SimplePie\Cache\NameFilter;
+use SimplePie\Cache\Psr16;
+use SimplePie\Content\Type\Sniffer;
+
+/**
+ * SimplePie
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie
+{
+    /**
+     * SimplePie Name
+     */
+    public const NAME = 'SimplePie';
+
+    /**
+     * SimplePie Version
+     */
+    public const VERSION = '1.8.0';
+
+    /**
+     * SimplePie Website URL
+     */
+    public const URL = 'http://simplepie.org';
+
+    /**
+     * SimplePie Linkback
+     */
+    public const LINKBACK = '<a href="' . self::URL . '" title="' . self::NAME . ' ' . self::VERSION . '">' . self::NAME . '</a>';
+
+    /**
+     * No Autodiscovery
+     * @see SimplePie::set_autodiscovery_level()
+     */
+    public const LOCATOR_NONE = 0;
+
+    /**
+     * Feed Link Element Autodiscovery
+     * @see SimplePie::set_autodiscovery_level()
+     */
+    public const LOCATOR_AUTODISCOVERY = 1;
+
+    /**
+     * Local Feed Extension Autodiscovery
+     * @see SimplePie::set_autodiscovery_level()
+     */
+    public const LOCATOR_LOCAL_EXTENSION = 2;
+
+    /**
+     * Local Feed Body Autodiscovery
+     * @see SimplePie::set_autodiscovery_level()
+     */
+    public const LOCATOR_LOCAL_BODY = 4;
+
+    /**
+     * Remote Feed Extension Autodiscovery
+     * @see SimplePie::set_autodiscovery_level()
+     */
+    public const LOCATOR_REMOTE_EXTENSION = 8;
+
+    /**
+     * Remote Feed Body Autodiscovery
+     * @see SimplePie::set_autodiscovery_level()
+     */
+    public const LOCATOR_REMOTE_BODY = 16;
+
+    /**
+     * All Feed Autodiscovery
+     * @see SimplePie::set_autodiscovery_level()
+     */
+    public const LOCATOR_ALL = 31;
+
+    /**
+     * No known feed type
+     */
+    public const TYPE_NONE = 0;
+
+    /**
+     * RSS 0.90
+     */
+    public const TYPE_RSS_090 = 1;
+
+    /**
+     * RSS 0.91 (Netscape)
+     */
+    public const TYPE_RSS_091_NETSCAPE = 2;
+
+    /**
+     * RSS 0.91 (Userland)
+     */
+    public const TYPE_RSS_091_USERLAND = 4;
+
+    /**
+     * RSS 0.91 (both Netscape and Userland)
+     */
+    public const TYPE_RSS_091 = 6;
+
+    /**
+     * RSS 0.92
+     */
+    public const TYPE_RSS_092 = 8;
+
+    /**
+     * RSS 0.93
+     */
+    public const TYPE_RSS_093 = 16;
+
+    /**
+     * RSS 0.94
+     */
+    public const TYPE_RSS_094 = 32;
+
+    /**
+     * RSS 1.0
+     */
+    public const TYPE_RSS_10 = 64;
+
+    /**
+     * RSS 2.0
+     */
+    public const TYPE_RSS_20 = 128;
+
+    /**
+     * RDF-based RSS
+     */
+    public const TYPE_RSS_RDF = 65;
+
+    /**
+     * Non-RDF-based RSS (truly intended as syndication format)
+     */
+    public const TYPE_RSS_SYNDICATION = 190;
+
+    /**
+     * All RSS
+     */
+    public const TYPE_RSS_ALL = 255;
+
+    /**
+     * Atom 0.3
+     */
+    public const TYPE_ATOM_03 = 256;
+
+    /**
+     * Atom 1.0
+     */
+    public const TYPE_ATOM_10 = 512;
+
+    /**
+     * All Atom
+     */
+    public const TYPE_ATOM_ALL = 768;
+
+    /**
+     * All feed types
+     */
+    public const TYPE_ALL = 1023;
+
+    /**
+     * No construct
+     */
+    public const CONSTRUCT_NONE = 0;
+
+    /**
+     * Text construct
+     */
+    public const CONSTRUCT_TEXT = 1;
+
+    /**
+     * HTML construct
+     */
+    public const CONSTRUCT_HTML = 2;
+
+    /**
+     * XHTML construct
+     */
+    public const CONSTRUCT_XHTML = 4;
+
+    /**
+     * base64-encoded construct
+     */
+    public const CONSTRUCT_BASE64 = 8;
+
+    /**
+     * IRI construct
+     */
+    public const CONSTRUCT_IRI = 16;
+
+    /**
+     * A construct that might be HTML
+     */
+    public const CONSTRUCT_MAYBE_HTML = 32;
+
+    /**
+     * All constructs
+     */
+    public const CONSTRUCT_ALL = 63;
+
+    /**
+     * Don't change case
+     */
+    public const SAME_CASE = 1;
+
+    /**
+     * Change to lowercase
+     */
+    public const LOWERCASE = 2;
+
+    /**
+     * Change to uppercase
+     */
+    public const UPPERCASE = 4;
+
+    /**
+     * PCRE for HTML attributes
+     */
+    public const PCRE_HTML_ATTRIBUTE = '((?:[\x09\x0A\x0B\x0C\x0D\x20]+[^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"(?:[^"]*)"|\'(?:[^\']*)\'|(?:[^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?)*)[\x09\x0A\x0B\x0C\x0D\x20]*';
+
+    /**
+     * PCRE for XML attributes
+     */
+    public const PCRE_XML_ATTRIBUTE = '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'))*)\s*';
+
+    /**
+     * XML Namespace
+     */
+    public const NAMESPACE_XML = 'http://www.w3.org/XML/1998/namespace';
+
+    /**
+     * Atom 1.0 Namespace
+     */
+    public const NAMESPACE_ATOM_10 = 'http://www.w3.org/2005/Atom';
+
+    /**
+     * Atom 0.3 Namespace
+     */
+    public const NAMESPACE_ATOM_03 = 'http://purl.org/atom/ns#';
+
+    /**
+     * RDF Namespace
+     */
+    public const NAMESPACE_RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
+
+    /**
+     * RSS 0.90 Namespace
+     */
+    public const NAMESPACE_RSS_090 = 'http://my.netscape.com/rdf/simple/0.9/';
+
+    /**
+     * RSS 1.0 Namespace
+     */
+    public const NAMESPACE_RSS_10 = 'http://purl.org/rss/1.0/';
+
+    /**
+     * RSS 1.0 Content Module Namespace
+     */
+    public const NAMESPACE_RSS_10_MODULES_CONTENT = 'http://purl.org/rss/1.0/modules/content/';
+
+    /**
+     * RSS 2.0 Namespace
+     * (Stupid, I know, but I'm certain it will confuse people less with support.)
+     */
+    public const NAMESPACE_RSS_20 = '';
+
+    /**
+     * DC 1.0 Namespace
+     */
+    public const NAMESPACE_DC_10 = 'http://purl.org/dc/elements/1.0/';
+
+    /**
+     * DC 1.1 Namespace
+     */
+    public const NAMESPACE_DC_11 = 'http://purl.org/dc/elements/1.1/';
+
+    /**
+     * W3C Basic Geo (WGS84 lat/long) Vocabulary Namespace
+     */
+    public const NAMESPACE_W3C_BASIC_GEO = 'http://www.w3.org/2003/01/geo/wgs84_pos#';
+
+    /**
+     * GeoRSS Namespace
+     */
+    public const NAMESPACE_GEORSS = 'http://www.georss.org/georss';
+
+    /**
+     * Media RSS Namespace
+     */
+    public const NAMESPACE_MEDIARSS = 'http://search.yahoo.com/mrss/';
+
+    /**
+     * Wrong Media RSS Namespace. Caused by a long-standing typo in the spec.
+     */
+    public const NAMESPACE_MEDIARSS_WRONG = 'http://search.yahoo.com/mrss';
+
+    /**
+     * Wrong Media RSS Namespace #2. New namespace introduced in Media RSS 1.5.
+     */
+    public const NAMESPACE_MEDIARSS_WRONG2 = 'http://video.search.yahoo.com/mrss';
+
+    /**
+     * Wrong Media RSS Namespace #3. A possible typo of the Media RSS 1.5 namespace.
+     */
+    public const NAMESPACE_MEDIARSS_WRONG3 = 'http://video.search.yahoo.com/mrss/';
+
+    /**
+     * Wrong Media RSS Namespace #4. New spec location after the RSS Advisory Board takes it over, but not a valid namespace.
+     */
+    public const NAMESPACE_MEDIARSS_WRONG4 = 'http://www.rssboard.org/media-rss';
+
+    /**
+     * Wrong Media RSS Namespace #5. A possible typo of the RSS Advisory Board URL.
+     */
+    public const NAMESPACE_MEDIARSS_WRONG5 = 'http://www.rssboard.org/media-rss/';
+
+    /**
+     * iTunes RSS Namespace
+     */
+    public const NAMESPACE_ITUNES = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
+
+    /**
+     * XHTML Namespace
+     */
+    public const NAMESPACE_XHTML = 'http://www.w3.org/1999/xhtml';
+
+    /**
+     * IANA Link Relations Registry
+     */
+    public const IANA_LINK_RELATIONS_REGISTRY = 'http://www.iana.org/assignments/relation/';
+
+    /**
+     * No file source
+     */
+    public const FILE_SOURCE_NONE = 0;
+
+    /**
+     * Remote file source
+     */
+    public const FILE_SOURCE_REMOTE = 1;
+
+    /**
+     * Local file source
+     */
+    public const FILE_SOURCE_LOCAL = 2;
+
+    /**
+     * fsockopen() file source
+     */
+    public const FILE_SOURCE_FSOCKOPEN = 4;
+
+    /**
+     * cURL file source
+     */
+    public const FILE_SOURCE_CURL = 8;
+
+    /**
+     * file_get_contents() file source
+     */
+    public const FILE_SOURCE_FILE_GET_CONTENTS = 16;
+
+    /**
+     * @var array Raw data
+     * @access private
+     */
+    public $data = [];
+
+    /**
+     * @var mixed Error string
+     * @access private
+     */
+    public $error;
+
+    /**
+     * @var int HTTP status code
+     * @see SimplePie::status_code()
+     * @access private
+     */
+    public $status_code = 0;
+
+    /**
+     * @var object Instance of \SimplePie\Sanitize (or other class)
+     * @see SimplePie::set_sanitize_class()
+     * @access private
+     */
+    public $sanitize;
+
+    /**
+     * @var string SimplePie Useragent
+     * @see SimplePie::set_useragent()
+     * @access private
+     */
+    public $useragent = '';
+
+    /**
+     * @var string Feed URL
+     * @see SimplePie::set_feed_url()
+     * @access private
+     */
+    public $feed_url;
+
+    /**
+     * @var string Original feed URL, or new feed URL iff HTTP 301 Moved Permanently
+     * @see SimplePie::subscribe_url()
+     * @access private
+     */
+    public $permanent_url = null;
+
+    /**
+     * @var object Instance of \SimplePie\File to use as a feed
+     * @see SimplePie::set_file()
+     * @access private
+     */
+    public $file;
+
+    /**
+     * @var string Raw feed data
+     * @see SimplePie::set_raw_data()
+     * @access private
+     */
+    public $raw_data;
+
+    /**
+     * @var int Timeout for fetching remote files
+     * @see SimplePie::set_timeout()
+     * @access private
+     */
+    public $timeout = 10;
+
+    /**
+     * @var array Custom curl options
+     * @see SimplePie::set_curl_options()
+     * @access private
+     */
+    public $curl_options = [];
+
+    /**
+     * @var bool Forces fsockopen() to be used for remote files instead
+     * of cURL, even if a new enough version is installed
+     * @see SimplePie::force_fsockopen()
+     * @access private
+     */
+    public $force_fsockopen = false;
+
+    /**
+     * @var bool Force the given data/URL to be treated as a feed no matter what
+     * it appears like
+     * @see SimplePie::force_feed()
+     * @access private
+     */
+    public $force_feed = false;
+
+    /**
+     * @var bool Enable/Disable Caching
+     * @see SimplePie::enable_cache()
+     * @access private
+     */
+    private $enable_cache = true;
+
+    /**
+     * @var DataCache|null
+     * @see SimplePie::set_cache()
+     */
+    private $cache = null;
+
+    /**
+     * @var NameFilter
+     * @see SimplePie::set_cache_namefilter()
+     */
+    private $cache_namefilter;
+
+    /**
+     * @var bool Force SimplePie to fallback to expired cache, if enabled,
+     * when feed is unavailable.
+     * @see SimplePie::force_cache_fallback()
+     * @access private
+     */
+    public $force_cache_fallback = false;
+
+    /**
+     * @var int Cache duration (in seconds)
+     * @see SimplePie::set_cache_duration()
+     * @access private
+     */
+    public $cache_duration = 3600;
+
+    /**
+     * @var int Auto-discovery cache duration (in seconds)
+     * @see SimplePie::set_autodiscovery_cache_duration()
+     * @access private
+     */
+    public $autodiscovery_cache_duration = 604800; // 7 Days.
+
+    /**
+     * @var string Cache location (relative to executing script)
+     * @see SimplePie::set_cache_location()
+     * @access private
+     */
+    public $cache_location = './cache';
+
+    /**
+     * @var string Function that creates the cache filename
+     * @see SimplePie::set_cache_name_function()
+     * @access private
+     */
+    public $cache_name_function = 'md5';
+
+    /**
+     * @var bool Reorder feed by date descending
+     * @see SimplePie::enable_order_by_date()
+     * @access private
+     */
+    public $order_by_date = true;
+
+    /**
+     * @var mixed Force input encoding to be set to the follow value
+     * (false, or anything type-cast to false, disables this feature)
+     * @see SimplePie::set_input_encoding()
+     * @access private
+     */
+    public $input_encoding = false;
+
+    /**
+     * @var int Feed Autodiscovery Level
+     * @see SimplePie::set_autodiscovery_level()
+     * @access private
+     */
+    public $autodiscovery = self::LOCATOR_ALL;
+
+    /**
+     * Class registry object
+     *
+     * @var \SimplePie\Registry
+     */
+    public $registry;
+
+    /**
+     * @var int Maximum number of feeds to check with autodiscovery
+     * @see SimplePie::set_max_checked_feeds()
+     * @access private
+     */
+    public $max_checked_feeds = 10;
+
+    /**
+     * @var array All the feeds found during the autodiscovery process
+     * @see SimplePie::get_all_discovered_feeds()
+     * @access private
+     */
+    public $all_discovered_feeds = [];
+
+    /**
+     * @var string Web-accessible path to the handler_image.php file.
+     * @see SimplePie::set_image_handler()
+     * @access private
+     */
+    public $image_handler = '';
+
+    /**
+     * @var array Stores the URLs when multiple feeds are being initialized.
+     * @see SimplePie::set_feed_url()
+     * @access private
+     */
+    public $multifeed_url = [];
+
+    /**
+     * @var array Stores SimplePie objects when multiple feeds initialized.
+     * @access private
+     */
+    public $multifeed_objects = [];
+
+    /**
+     * @var array Stores the get_object_vars() array for use with multifeeds.
+     * @see SimplePie::set_feed_url()
+     * @access private
+     */
+    public $config_settings = null;
+
+    /**
+     * @var integer Stores the number of items to return per-feed with multifeeds.
+     * @see SimplePie::set_item_limit()
+     * @access private
+     */
+    public $item_limit = 0;
+
+    /**
+     * @var bool Stores if last-modified and/or etag headers were sent with the
+     * request when checking a feed.
+     */
+    public $check_modified = false;
+
+    /**
+     * @var array Stores the default attributes to be stripped by strip_attributes().
+     * @see SimplePie::strip_attributes()
+     * @access private
+     */
+    public $strip_attributes = ['bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'];
+
+    /**
+     * @var array Stores the default attributes to add to different tags by add_attributes().
+     * @see SimplePie::add_attributes()
+     * @access private
+     */
+    public $add_attributes = ['audio' => ['preload' => 'none'], 'iframe' => ['sandbox' => 'allow-scripts allow-same-origin'], 'video' => ['preload' => 'none']];
+
+    /**
+     * @var array Stores the default tags to be stripped by strip_htmltags().
+     * @see SimplePie::strip_htmltags()
+     * @access private
+     */
+    public $strip_htmltags = ['base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'];
+
+    /**
+     * @var array Stores the default attributes to be renamed by rename_attributes().
+     * @see SimplePie::rename_attributes()
+     * @access private
+     */
+    public $rename_attributes = [];
+
+    /**
+     * @var bool Should we throw exceptions, or use the old-style error property?
+     * @access private
+     */
+    public $enable_exceptions = false;
+
+    /**
+     * The SimplePie class contains feed level data and options
+     *
+     * To use SimplePie, create the SimplePie object with no parameters. You can
+     * then set configuration options using the provided methods. After setting
+     * them, you must initialise the feed using $feed->init(). At that point the
+     * object's methods and properties will be available to you.
+     *
+     * Previously, it was possible to pass in the feed URL along with cache
+     * options directly into the constructor. This has been removed as of 1.3 as
+     * it caused a lot of confusion.
+     *
+     * @since 1.0 Preview Release
+     */
+    public function __construct()
+    {
+        if (version_compare(PHP_VERSION, '7.2', '<')) {
+            exit('Please upgrade to PHP 7.2 or newer.');
+        }
+
+        $this->set_useragent();
+
+        $this->set_cache_namefilter(new CallableNameFilter($this->cache_name_function));
+
+        // Other objects, instances created here so we can set options on them
+        $this->sanitize = new \SimplePie\Sanitize();
+        $this->registry = new \SimplePie\Registry();
+
+        if (func_num_args() > 0) {
+            trigger_error('Passing parameters to the constructor is no longer supported. Please use set_feed_url(), set_cache_location(), and set_cache_duration() directly.', \E_USER_DEPRECATED);
+
+            $args = func_get_args();
+            switch (count($args)) {
+                case 3:
+                    $this->set_cache_duration($args[2]);
+                    // no break
+                case 2:
+                    $this->set_cache_location($args[1]);
+                    // no break
+                case 1:
+                    $this->set_feed_url($args[0]);
+                    $this->init();
+            }
+        }
+    }
+
+    /**
+     * Used for converting object to a string
+     */
+    public function __toString()
+    {
+        return md5(serialize($this->data));
+    }
+
+    /**
+     * Remove items that link back to this before destroying this object
+     */
+    public function __destruct()
+    {
+        if (!gc_enabled()) {
+            if (!empty($this->data['items'])) {
+                foreach ($this->data['items'] as $item) {
+                    $item->__destruct();
+                }
+                unset($item, $this->data['items']);
+            }
+            if (!empty($this->data['ordered_items'])) {
+                foreach ($this->data['ordered_items'] as $item) {
+                    $item->__destruct();
+                }
+                unset($item, $this->data['ordered_items']);
+            }
+        }
+    }
+
+    /**
+     * Force the given data/URL to be treated as a feed
+     *
+     * This tells SimplePie to ignore the content-type provided by the server.
+     * Be careful when using this option, as it will also disable autodiscovery.
+     *
+     * @since 1.1
+     * @param bool $enable Force the given data/URL to be treated as a feed
+     */
+    public function force_feed($enable = false)
+    {
+        $this->force_feed = (bool) $enable;
+    }
+
+    /**
+     * Set the URL of the feed you want to parse
+     *
+     * This allows you to enter the URL of the feed you want to parse, or the
+     * website you want to try to use auto-discovery on. This takes priority
+     * over any set raw data.
+     *
+     * You can set multiple feeds to mash together by passing an array instead
+     * of a string for the $url. Remember that with each additional feed comes
+     * additional processing and resources.
+     *
+     * @since 1.0 Preview Release
+     * @see set_raw_data()
+     * @param string|array $url This is the URL (or array of URLs) that you want to parse.
+     */
+    public function set_feed_url($url)
+    {
+        $this->multifeed_url = [];
+        if (is_array($url)) {
+            foreach ($url as $value) {
+                $this->multifeed_url[] = $this->registry->call(Misc::class, 'fix_protocol', [$value, 1]);
+            }
+        } else {
+            $this->feed_url = $this->registry->call(Misc::class, 'fix_protocol', [$url, 1]);
+            $this->permanent_url = $this->feed_url;
+        }
+    }
+
+    /**
+     * Set an instance of {@see \SimplePie\File} to use as a feed
+     *
+     * @param \SimplePie\File &$file
+     * @return bool True on success, false on failure
+     */
+    public function set_file(&$file)
+    {
+        if ($file instanceof \SimplePie\File) {
+            $this->feed_url = $file->url;
+            $this->permanent_url = $this->feed_url;
+            $this->file = &$file;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Set the raw XML data to parse
+     *
+     * Allows you to use a string of RSS/Atom data instead of a remote feed.
+     *
+     * If you have a feed available as a string in PHP, you can tell SimplePie
+     * to parse that data string instead of a remote feed. Any set feed URL
+     * takes precedence.
+     *
+     * @since 1.0 Beta 3
+     * @param string $data RSS or Atom data as a string.
+     * @see set_feed_url()
+     */
+    public function set_raw_data($data)
+    {
+        $this->raw_data = $data;
+    }
+
+    /**
+     * Set the default timeout for fetching remote feeds
+     *
+     * This allows you to change the maximum time the feed's server to respond
+     * and send the feed back.
+     *
+     * @since 1.0 Beta 3
+     * @param int $timeout The maximum number of seconds to spend waiting to retrieve a feed.
+     */
+    public function set_timeout($timeout = 10)
+    {
+        $this->timeout = (int) $timeout;
+    }
+
+    /**
+     * Set custom curl options
+     *
+     * This allows you to change default curl options
+     *
+     * @since 1.0 Beta 3
+     * @param array $curl_options Curl options to add to default settings
+     */
+    public function set_curl_options(array $curl_options = [])
+    {
+        $this->curl_options = $curl_options;
+    }
+
+    /**
+     * Force SimplePie to use fsockopen() instead of cURL
+     *
+     * @since 1.0 Beta 3
+     * @param bool $enable Force fsockopen() to be used
+     */
+    public function force_fsockopen($enable = false)
+    {
+        $this->force_fsockopen = (bool) $enable;
+    }
+
+    /**
+     * Enable/disable caching in SimplePie.
+     *
+     * This option allows you to disable caching all-together in SimplePie.
+     * However, disabling the cache can lead to longer load times.
+     *
+     * @since 1.0 Preview Release
+     * @param bool $enable Enable caching
+     */
+    public function enable_cache($enable = true)
+    {
+        $this->enable_cache = (bool) $enable;
+    }
+
+    /**
+     * Set a PSR-16 implementation as cache
+     *
+     * @param CacheInterface $psr16cache The PSR-16 cache implementation
+     *
+     * @return void
+     */
+    public function set_cache(CacheInterface $cache)
+    {
+        $this->cache = new Psr16($cache);
+    }
+
+    /**
+     * SimplePie to continue to fall back to expired cache, if enabled, when
+     * feed is unavailable.
+     *
+     * This tells SimplePie to ignore any file errors and fall back to cache
+     * instead. This only works if caching is enabled and cached content
+     * still exists.
+     *
+     * @deprecated since SimplePie 1.8.0, expired cache will not be used anymore.
+     *
+     * @param bool $enable Force use of cache on fail.
+     */
+    public function force_cache_fallback($enable = false)
+    {
+        // @trigger_error(sprintf('SimplePie\SimplePie::force_cache_fallback() is deprecated since SimplePie 1.8.0, expired cache will not be used anymore.'), \E_USER_DEPRECATED);
+        $this->force_cache_fallback = (bool) $enable;
+    }
+
+    /**
+     * Set the length of time (in seconds) that the contents of a feed will be
+     * cached
+     *
+     * @param int $seconds The feed content cache duration
+     */
+    public function set_cache_duration($seconds = 3600)
+    {
+        $this->cache_duration = (int) $seconds;
+    }
+
+    /**
+     * Set the length of time (in seconds) that the autodiscovered feed URL will
+     * be cached
+     *
+     * @param int $seconds The autodiscovered feed URL cache duration.
+     */
+    public function set_autodiscovery_cache_duration($seconds = 604800)
+    {
+        $this->autodiscovery_cache_duration = (int) $seconds;
+    }
+
+    /**
+     * Set the file system location where the cached files should be stored
+     *
+     * @deprecated since SimplePie 1.8.0, use \SimplePie\SimplePie::set_cache() instead.
+     *
+     * @param string $location The file system location.
+     */
+    public function set_cache_location($location = './cache')
+    {
+        // @trigger_error(sprintf('SimplePie\SimplePie::set_cache_location() is deprecated since SimplePie 1.8.0, please use "SimplePie\SimplePie::set_cache()" instead.'), \E_USER_DEPRECATED);
+        $this->cache_location = (string) $location;
+    }
+
+    /**
+     * Return the filename (i.e. hash, without path and without extension) of the file to cache a given URL.
+     *
+     * @param string $url The URL of the feed to be cached.
+     * @return string A filename (i.e. hash, without path and without extension).
+     */
+    public function get_cache_filename($url)
+    {
+        // Append custom parameters to the URL to avoid cache pollution in case of multiple calls with different parameters.
+        $url .= $this->force_feed ? '#force_feed' : '';
+        $options = [];
+        if ($this->timeout != 10) {
+            $options[CURLOPT_TIMEOUT] = $this->timeout;
+        }
+        if ($this->useragent !== \SimplePie\Misc::get_default_useragent()) {
+            $options[CURLOPT_USERAGENT] = $this->useragent;
+        }
+        if (!empty($this->curl_options)) {
+            foreach ($this->curl_options as $k => $v) {
+                $options[$k] = $v;
+            }
+        }
+        if (!empty($options)) {
+            ksort($options);
+            $url .= '#' . urlencode(var_export($options, true));
+        }
+
+        return $this->cache_namefilter->filter($url);
+    }
+
+    /**
+     * Set whether feed items should be sorted into reverse chronological order
+     *
+     * @param bool $enable Sort as reverse chronological order.
+     */
+    public function enable_order_by_date($enable = true)
+    {
+        $this->order_by_date = (bool) $enable;
+    }
+
+    /**
+     * Set the character encoding used to parse the feed
+     *
+     * This overrides the encoding reported by the feed, however it will fall
+     * back to the normal encoding detection if the override fails
+     *
+     * @param string $encoding Character encoding
+     */
+    public function set_input_encoding($encoding = false)
+    {
+        if ($encoding) {
+            $this->input_encoding = (string) $encoding;
+        } else {
+            $this->input_encoding = false;
+        }
+    }
+
+    /**
+     * Set how much feed autodiscovery to do
+     *
+     * @see \SimplePie\SimplePie::LOCATOR_NONE
+     * @see \SimplePie\SimplePie::LOCATOR_AUTODISCOVERY
+     * @see \SimplePie\SimplePie::LOCATOR_LOCAL_EXTENSION
+     * @see \SimplePie\SimplePie::LOCATOR_LOCAL_BODY
+     * @see \SimplePie\SimplePie::LOCATOR_REMOTE_EXTENSION
+     * @see \SimplePie\SimplePie::LOCATOR_REMOTE_BODY
+     * @see \SimplePie\SimplePie::LOCATOR_ALL
+     * @param int $level Feed Autodiscovery Level (level can be a combination of the above constants, see bitwise OR operator)
+     */
+    public function set_autodiscovery_level($level = self::LOCATOR_ALL)
+    {
+        $this->autodiscovery = (int) $level;
+    }
+
+    /**
+     * Get the class registry
+     *
+     * Use this to override SimplePie's default classes
+     * @see \SimplePie\Registry
+     *
+     * @return Registry
+     */
+    public function &get_registry()
+    {
+        return $this->registry;
+    }
+
+    /**
+     * Set which class SimplePie uses for caching
+     *
+     * @deprecated since SimplePie 1.3, use {@see set_cache()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_cache_class($class = Cache::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::set_cache()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Cache::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for auto-discovery
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_locator_class($class = Locator::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Locator::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for XML parsing
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_parser_class($class = Parser::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Parser::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for remote file fetching
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_file_class($class = File::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(File::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for data sanitization
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_sanitize_class($class = Sanitize::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Sanitize::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for handling feed items
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_item_class($class = Item::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Item::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for handling author data
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_author_class($class = Author::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Author::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for handling category data
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_category_class($class = Category::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Category::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for feed enclosures
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_enclosure_class($class = Enclosure::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Enclosure::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for `<media:text>` captions
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_caption_class($class = Caption::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Caption::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for `<media:copyright>`
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_copyright_class($class = Copyright::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Copyright::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for `<media:credit>`
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_credit_class($class = Credit::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Credit::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for `<media:rating>`
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_rating_class($class = Rating::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Rating::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for `<media:restriction>`
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_restriction_class($class = Restriction::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Restriction::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses for content-type sniffing
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_content_type_sniffer_class($class = Sniffer::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Sniffer::class, $class, true);
+    }
+
+    /**
+     * Set which class SimplePie uses item sources
+     *
+     * @deprecated since SimplePie 1.3, use {@see get_registry()} instead
+     *
+     * @param string $class Name of custom class
+     *
+     * @return boolean True on success, false otherwise
+     */
+    public function set_source_class($class = Source::class)
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.3, please use "SimplePie\SimplePie::get_registry()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->registry->register(Source::class, $class, true);
+    }
+
+    /**
+     * Set the user agent string
+     *
+     * @param string $ua New user agent string.
+     */
+    public function set_useragent($ua = null)
+    {
+        if ($ua === null) {
+            $ua = \SimplePie\Misc::get_default_useragent();
+        }
+
+        $this->useragent = (string) $ua;
+    }
+
+    /**
+     * Set a namefilter to modify the cache filename with
+     *
+     * @param NameFilter $filter
+     *
+     * @return void
+     */
+    public function set_cache_namefilter(NameFilter $filter): void
+    {
+        $this->cache_namefilter = $filter;
+    }
+
+    /**
+     * Set callback function to create cache filename with
+     *
+     * @deprecated since SimplePie 1.8.0, use {@see set_cache_namefilter()} instead
+     *
+     * @param mixed $function Callback function
+     */
+    public function set_cache_name_function($function = 'md5')
+    {
+        // trigger_error(sprintf('"%s()" is deprecated since SimplePie 1.8.0, please use "SimplePie\SimplePie::set_cache_namefilter()" instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        if (is_callable($function)) {
+            $this->cache_name_function = $function;
+
+            $this->set_cache_namefilter(new CallableNameFilter($this->cache_name_function));
+        }
+    }
+
+    /**
+     * Set options to make SP as fast as possible
+     *
+     * Forgoes a substantial amount of data sanitization in favor of speed. This
+     * turns SimplePie into a dumb parser of feeds.
+     *
+     * @param bool $set Whether to set them or not
+     */
+    public function set_stupidly_fast($set = false)
+    {
+        if ($set) {
+            $this->enable_order_by_date(false);
+            $this->remove_div(false);
+            $this->strip_comments(false);
+            $this->strip_htmltags(false);
+            $this->strip_attributes(false);
+            $this->add_attributes(false);
+            $this->set_image_handler(false);
+            $this->set_https_domains([]);
+        }
+    }
+
+    /**
+     * Set maximum number of feeds to check with autodiscovery
+     *
+     * @param int $max Maximum number of feeds to check
+     */
+    public function set_max_checked_feeds($max = 10)
+    {
+        $this->max_checked_feeds = (int) $max;
+    }
+
+    public function remove_div($enable = true)
+    {
+        $this->sanitize->remove_div($enable);
+    }
+
+    public function strip_htmltags($tags = '', $encode = null)
+    {
+        if ($tags === '') {
+            $tags = $this->strip_htmltags;
+        }
+        $this->sanitize->strip_htmltags($tags);
+        if ($encode !== null) {
+            $this->sanitize->encode_instead_of_strip($tags);
+        }
+    }
+
+    public function encode_instead_of_strip($enable = true)
+    {
+        $this->sanitize->encode_instead_of_strip($enable);
+    }
+
+    public function rename_attributes($attribs = '')
+    {
+        if ($attribs === '') {
+            $attribs = $this->rename_attributes;
+        }
+        $this->sanitize->rename_attributes($attribs);
+    }
+
+    public function strip_attributes($attribs = '')
+    {
+        if ($attribs === '') {
+            $attribs = $this->strip_attributes;
+        }
+        $this->sanitize->strip_attributes($attribs);
+    }
+
+    public function add_attributes($attribs = '')
+    {
+        if ($attribs === '') {
+            $attribs = $this->add_attributes;
+        }
+        $this->sanitize->add_attributes($attribs);
+    }
+
+    /**
+     * Set the output encoding
+     *
+     * Allows you to override SimplePie's output to match that of your webpage.
+     * This is useful for times when your webpages are not being served as
+     * UTF-8. This setting will be obeyed by {@see handle_content_type()}, and
+     * is similar to {@see set_input_encoding()}.
+     *
+     * It should be noted, however, that not all character encodings can support
+     * all characters. If your page is being served as ISO-8859-1 and you try
+     * to display a Japanese feed, you'll likely see garbled characters.
+     * Because of this, it is highly recommended to ensure that your webpages
+     * are served as UTF-8.
+     *
+     * The number of supported character encodings depends on whether your web
+     * host supports {@link http://php.net/mbstring mbstring},
+     * {@link http://php.net/iconv iconv}, or both. See
+     * {@link http://simplepie.org/wiki/faq/Supported_Character_Encodings} for
+     * more information.
+     *
+     * @param string $encoding
+     */
+    public function set_output_encoding($encoding = 'UTF-8')
+    {
+        $this->sanitize->set_output_encoding($encoding);
+    }
+
+    public function strip_comments($strip = false)
+    {
+        $this->sanitize->strip_comments($strip);
+    }
+
+    /**
+     * Set element/attribute key/value pairs of HTML attributes
+     * containing URLs that need to be resolved relative to the feed
+     *
+     * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite,
+     * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite,
+     * |q|@cite
+     *
+     * @since 1.0
+     * @param array|null $element_attribute Element/attribute key/value pairs, null for default
+     */
+    public function set_url_replacements($element_attribute = null)
+    {
+        $this->sanitize->set_url_replacements($element_attribute);
+    }
+
+    /**
+     * Set the list of domains for which to force HTTPS.
+     * @see \SimplePie\Sanitize::set_https_domains()
+     * @param array List of HTTPS domains. Example array('biz', 'example.com', 'example.org', 'www.example.net').
+     */
+    public function set_https_domains($domains = [])
+    {
+        if (is_array($domains)) {
+            $this->sanitize->set_https_domains($domains);
+        }
+    }
+
+    /**
+     * Set the handler to enable the display of cached images.
+     *
+     * @param string $page Web-accessible path to the handler_image.php file.
+     * @param string $qs The query string that the value should be passed to.
+     */
+    public function set_image_handler($page = false, $qs = 'i')
+    {
+        if ($page !== false) {
+            $this->sanitize->set_image_handler($page . '?' . $qs . '=');
+        } else {
+            $this->image_handler = '';
+        }
+    }
+
+    /**
+     * Set the limit for items returned per-feed with multifeeds
+     *
+     * @param integer $limit The maximum number of items to return.
+     */
+    public function set_item_limit($limit = 0)
+    {
+        $this->item_limit = (int) $limit;
+    }
+
+    /**
+     * Enable throwing exceptions
+     *
+     * @param boolean $enable Should we throw exceptions, or use the old-style error property?
+     */
+    public function enable_exceptions($enable = true)
+    {
+        $this->enable_exceptions = $enable;
+    }
+
+    /**
+     * Initialize the feed object
+     *
+     * This is what makes everything happen. Period. This is where all of the
+     * configuration options get processed, feeds are fetched, cached, and
+     * parsed, and all of that other good stuff.
+     *
+     * @return boolean True if successful, false otherwise
+     */
+    public function init()
+    {
+        // Check absolute bare minimum requirements.
+        if (!extension_loaded('xml') || !extension_loaded('pcre')) {
+            $this->error = 'XML or PCRE extensions not loaded!';
+            return false;
+        }
+        // Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
+        elseif (!extension_loaded('xmlreader')) {
+            static $xml_is_sane = null;
+            if ($xml_is_sane === null) {
+                $parser_check = xml_parser_create();
+                xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
+                xml_parser_free($parser_check);
+                $xml_is_sane = isset($values[0]['value']);
+            }
+            if (!$xml_is_sane) {
+                return false;
+            }
+        }
+
+        // The default sanitize class gets set in the constructor, check if it has
+        // changed.
+        if ($this->registry->get_class(Sanitize::class) !== 'SimplePie\Sanitize') {
+            $this->sanitize = $this->registry->create(Sanitize::class);
+        }
+        if (method_exists($this->sanitize, 'set_registry')) {
+            $this->sanitize->set_registry($this->registry);
+        }
+
+        // Pass whatever was set with config options over to the sanitizer.
+        // Pass the classes in for legacy support; new classes should use the registry instead
+        $this->sanitize->pass_cache_data(
+            $this->enable_cache,
+            $this->cache_location,
+            $this->cache_namefilter,
+            $this->registry->get_class(Cache::class),
+            $this->cache
+        );
+        $this->sanitize->pass_file_data($this->registry->get_class(File::class), $this->timeout, $this->useragent, $this->force_fsockopen, $this->curl_options);
+
+        if (!empty($this->multifeed_url)) {
+            $i = 0;
+            $success = 0;
+            $this->multifeed_objects = [];
+            $this->error = [];
+            foreach ($this->multifeed_url as $url) {
+                $this->multifeed_objects[$i] = clone $this;
+                $this->multifeed_objects[$i]->set_feed_url($url);
+                $single_success = $this->multifeed_objects[$i]->init();
+                $success |= $single_success;
+                if (!$single_success) {
+                    $this->error[$i] = $this->multifeed_objects[$i]->error();
+                }
+                $i++;
+            }
+            return (bool) $success;
+        } elseif ($this->feed_url === null && $this->raw_data === null) {
+            return false;
+        }
+
+        $this->error = null;
+        $this->data = [];
+        $this->check_modified = false;
+        $this->multifeed_objects = [];
+        $cache = false;
+
+        if ($this->feed_url !== null) {
+            $parsed_feed_url = $this->registry->call(Misc::class, 'parse_url', [$this->feed_url]);
+
+            // Decide whether to enable caching
+            if ($this->enable_cache && $parsed_feed_url['scheme'] !== '') {
+                $cache = $this->get_cache($this->feed_url);
+            }
+
+            // Fetch the data via \SimplePie\File into $this->raw_data
+            if (($fetched = $this->fetch_data($cache)) === true) {
+                return true;
+            } elseif ($fetched === false) {
+                return false;
+            }
+
+            [$headers, $sniffed] = $fetched;
+        }
+
+        // Empty response check
+        if (empty($this->raw_data)) {
+            $this->error = "A feed could not be found at `$this->feed_url`. Empty body.";
+            $this->registry->call(Misc::class, 'error', [$this->error, E_USER_NOTICE, __FILE__, __LINE__]);
+            return false;
+        }
+
+        // Set up array of possible encodings
+        $encodings = [];
+
+        // First check to see if input has been overridden.
+        if ($this->input_encoding !== false) {
+            $encodings[] = strtoupper($this->input_encoding);
+        }
+
+        $application_types = ['application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity'];
+        $text_types = ['text/xml', 'text/xml-external-parsed-entity'];
+
+        // RFC 3023 (only applies to sniffed content)
+        if (isset($sniffed)) {
+            if (in_array($sniffed, $application_types) || substr($sniffed, 0, 12) === 'application/' && substr($sniffed, -4) === '+xml') {
+                if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset)) {
+                    $encodings[] = strtoupper($charset[1]);
+                }
+                $encodings = array_merge($encodings, $this->registry->call(Misc::class, 'xml_encoding', [$this->raw_data, &$this->registry]));
+                $encodings[] = 'UTF-8';
+            } elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml') {
+                if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset)) {
+                    $encodings[] = strtoupper($charset[1]);
+                }
+                $encodings[] = 'US-ASCII';
+            }
+            // Text MIME-type default
+            elseif (substr($sniffed, 0, 5) === 'text/') {
+                $encodings[] = 'UTF-8';
+            }
+        }
+
+        // Fallback to XML 1.0 Appendix F.1/UTF-8/ISO-8859-1
+        $encodings = array_merge($encodings, $this->registry->call(Misc::class, 'xml_encoding', [$this->raw_data, &$this->registry]));
+        $encodings[] = 'UTF-8';
+        $encodings[] = 'ISO-8859-1';
+
+        // There's no point in trying an encoding twice
+        $encodings = array_unique($encodings);
+
+        // Loop through each possible encoding, till we return something, or run out of possibilities
+        foreach ($encodings as $encoding) {
+            // Change the encoding to UTF-8 (as we always use UTF-8 internally)
+            if ($utf8_data = $this->registry->call(Misc::class, 'change_encoding', [$this->raw_data, $encoding, 'UTF-8'])) {
+                // Create new parser
+                $parser = $this->registry->create(Parser::class);
+
+                // If it's parsed fine
+                if ($parser->parse($utf8_data, 'UTF-8', $this->permanent_url)) {
+                    $this->data = $parser->get_data();
+                    if (!($this->get_type() & ~self::TYPE_NONE)) {
+                        $this->error = "A feed could not be found at `$this->feed_url`. This does not appear to be a valid RSS or Atom feed.";
+                        $this->registry->call(Misc::class, 'error', [$this->error, E_USER_NOTICE, __FILE__, __LINE__]);
+                        return false;
+                    }
+
+                    if (isset($headers)) {
+                        $this->data['headers'] = $headers;
+                    }
+                    $this->data['build'] = \SimplePie\Misc::get_build();
+
+                    // Cache the file if caching is enabled
+                    $this->data['cache_expiration_time'] = $this->cache_duration + time();
+                    if ($cache && !$cache->set_data($this->get_cache_filename($this->feed_url), $this->data, $this->cache_duration)) {
+                        trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+                    }
+                    return true;
+                }
+            }
+        }
+
+        if (isset($parser)) {
+            // We have an error, just set \SimplePie\Misc::error to it and quit
+            $this->error = $this->feed_url;
+            $this->error .= sprintf(' is invalid XML, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
+        } else {
+            $this->error = 'The data could not be converted to UTF-8.';
+            if (!extension_loaded('mbstring') && !extension_loaded('iconv') && !class_exists('\UConverter')) {
+                $this->error .= ' You MUST have either the iconv, mbstring or intl (PHP 5.5+) extension installed and enabled.';
+            } else {
+                $missingExtensions = [];
+                if (!extension_loaded('iconv')) {
+                    $missingExtensions[] = 'iconv';
+                }
+                if (!extension_loaded('mbstring')) {
+                    $missingExtensions[] = 'mbstring';
+                }
+                if (!class_exists('\UConverter')) {
+                    $missingExtensions[] = 'intl (PHP 5.5+)';
+                }
+                $this->error .= ' Try installing/enabling the ' . implode(' or ', $missingExtensions) . ' extension.';
+            }
+        }
+
+        $this->registry->call(Misc::class, 'error', [$this->error, E_USER_NOTICE, __FILE__, __LINE__]);
+
+        return false;
+    }
+
+    /**
+     * Fetch the data via \SimplePie\File
+     *
+     * If the data is already cached, attempt to fetch it from there instead
+     * @param Base|DataCache|false $cache Cache handler, or false to not load from the cache
+     * @return array|true Returns true if the data was loaded from the cache, or an array of HTTP headers and sniffed type
+     */
+    protected function fetch_data(&$cache)
+    {
+        if (is_object($cache) && $cache instanceof Base) {
+            // @trigger_error(sprintf('Providing $cache as "\SimplePie\Cache\Base" in %s() is deprecated since SimplePie 1.8.0, please provide "\SimplePie\Cache\DataCache" implementation instead.', __METHOD__), \E_USER_DEPRECATED);
+            $cache = new BaseDataCache($cache);
+        }
+
+        if ($cache !== false && !$cache instanceof DataCache) {
+            throw new InvalidArgumentException(sprintf(
+                '%s(): Argument #1 ($cache) must be of type %s|false',
+                __METHOD__,
+                DataCache::class
+            ), 1);
+        }
+
+        $cacheKey = $this->get_cache_filename($this->feed_url);
+
+        // If it's enabled, use the cache
+        if ($cache) {
+            // Load the Cache
+            $this->data = $cache->get_data($cacheKey, []);
+
+            if (!empty($this->data)) {
+                // If the cache is for an outdated build of SimplePie
+                if (!isset($this->data['build']) || $this->data['build'] !== \SimplePie\Misc::get_build()) {
+                    $cache->delete_data($cacheKey);
+                    $this->data = [];
+                }
+                // If we've hit a collision just rerun it with caching disabled
+                elseif (isset($this->data['url']) && $this->data['url'] !== $this->feed_url) {
+                    $cache = false;
+                    $this->data = [];
+                }
+                // If we've got a non feed_url stored (if the page isn't actually a feed, or is a redirect) use that URL.
+                elseif (isset($this->data['feed_url'])) {
+                    // Do not need to do feed autodiscovery yet.
+                    if ($this->data['feed_url'] !== $this->data['url']) {
+                        $this->set_feed_url($this->data['feed_url']);
+                        $this->data['url'] = $this->data['feed_url'];
+
+                        $cache->set_data($this->get_cache_filename($this->feed_url), $this->data, $this->autodiscovery_cache_duration);
+
+                        return $this->init();
+                    }
+
+                    $cache->delete_data($this->get_cache_filename($this->feed_url));
+                    $this->data = [];
+                }
+                // Check if the cache has been updated
+                elseif (isset($this->data['cache_expiration_time']) && $this->data['cache_expiration_time'] > time()) {
+                    // Want to know if we tried to send last-modified and/or etag headers
+                    // when requesting this file. (Note that it's up to the file to
+                    // support this, but we don't always send the headers either.)
+                    $this->check_modified = true;
+                    if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag'])) {
+                        $headers = [
+                            'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+                        ];
+                        if (isset($this->data['headers']['last-modified'])) {
+                            $headers['if-modified-since'] = $this->data['headers']['last-modified'];
+                        }
+                        if (isset($this->data['headers']['etag'])) {
+                            $headers['if-none-match'] = $this->data['headers']['etag'];
+                        }
+
+                        $file = $this->registry->create(File::class, [$this->feed_url, $this->timeout / 10, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options]);
+                        $this->status_code = $file->status_code;
+
+                        if ($file->success) {
+                            if ($file->status_code === 304) {
+                                // Set raw_data to false here too, to signify that the cache
+                                // is still valid.
+                                $this->raw_data = false;
+                                $cache->set_data($cacheKey, $this->data, $this->cache_duration);
+                                return true;
+                            }
+                        } else {
+                            $this->check_modified = false;
+                            if ($this->force_cache_fallback) {
+                                $cache->set_data($cacheKey, $this->data, $this->cache_duration);
+                                return true;
+                            }
+
+                            unset($file);
+                        }
+                    }
+                }
+                // If the cache is still valid, just return true
+                else {
+                    $this->raw_data = false;
+                    return true;
+                }
+            }
+            // If the cache is empty
+            else {
+                $this->data = [];
+            }
+        }
+
+        // If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
+        if (!isset($file)) {
+            if ($this->file instanceof \SimplePie\File && $this->file->url === $this->feed_url) {
+                $file = &$this->file;
+            } else {
+                $headers = [
+                    'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+                ];
+                $file = $this->registry->create(File::class, [$this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options]);
+            }
+        }
+        $this->status_code = $file->status_code;
+
+        // If the file connection has an error, set SimplePie::error to that and quit
+        if (!$file->success && !($file->method & self::FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300))) {
+            $this->error = $file->error;
+            return !empty($this->data);
+        }
+
+        if (!$this->force_feed) {
+            // Check if the supplied URL is a feed, if it isn't, look for it.
+            $locate = $this->registry->create(Locator::class, [&$file, $this->timeout, $this->useragent, $this->max_checked_feeds, $this->force_fsockopen, $this->curl_options]);
+
+            if (!$locate->is_feed($file)) {
+                $copyStatusCode = $file->status_code;
+                $copyContentType = $file->headers['content-type'];
+                try {
+                    $microformats = false;
+                    if (class_exists('DOMXpath') && function_exists('Mf2\parse')) {
+                        $doc = new \DOMDocument();
+                        @$doc->loadHTML($file->body);
+                        $xpath = new \DOMXpath($doc);
+                        // Check for both h-feed and h-entry, as both a feed with no entries
+                        // and a list of entries without an h-feed wrapper are both valid.
+                        $query = '//*[contains(concat(" ", @class, " "), " h-feed ") or '.
+                            'contains(concat(" ", @class, " "), " h-entry ")]';
+                        $result = $xpath->query($query);
+                        $microformats = $result->length !== 0;
+                    }
+                    // Now also do feed discovery, but if microformats were found don't
+                    // overwrite the current value of file.
+                    $discovered = $locate->find(
+                        $this->autodiscovery,
+                        $this->all_discovered_feeds
+                    );
+                    if ($microformats) {
+                        if ($hub = $locate->get_rel_link('hub')) {
+                            $self = $locate->get_rel_link('self');
+                            $this->store_links($file, $hub, $self);
+                        }
+                        // Push the current file onto all_discovered feeds so the user can
+                        // be shown this as one of the options.
+                        if (isset($this->all_discovered_feeds)) {
+                            $this->all_discovered_feeds[] = $file;
+                        }
+                    } else {
+                        if ($discovered) {
+                            $file = $discovered;
+                        } else {
+                            // We need to unset this so that if SimplePie::set_file() has
+                            // been called that object is untouched
+                            unset($file);
+                            $this->error = "A feed could not be found at `$this->feed_url`; the status code is `$copyStatusCode` and content-type is `$copyContentType`";
+                            $this->registry->call(Misc::class, 'error', [$this->error, E_USER_NOTICE, __FILE__, __LINE__]);
+                            return false;
+                        }
+                    }
+                } catch (\SimplePie\Exception $e) {
+                    // We need to unset this so that if SimplePie::set_file() has been called that object is untouched
+                    unset($file);
+                    // This is usually because DOMDocument doesn't exist
+                    $this->error = $e->getMessage();
+                    $this->registry->call(Misc::class, 'error', [$this->error, E_USER_NOTICE, $e->getFile(), $e->getLine()]);
+                    return false;
+                }
+
+                if ($cache) {
+                    $this->data = [
+                        'url' => $this->feed_url,
+                        'feed_url' => $file->url,
+                        'build' => \SimplePie\Misc::get_build(),
+                        'cache_expiration_time' => $this->cache_duration + time(),
+                    ];
+
+                    if (!$cache->set_data($cacheKey, $this->data, $this->cache_duration)) {
+                        trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+                    }
+                }
+            }
+            $this->feed_url = $file->url;
+            $locate = null;
+        }
+
+        $this->raw_data = $file->body;
+        $this->permanent_url = $file->permanent_url;
+        $headers = $file->headers;
+        $sniffer = $this->registry->create(Sniffer::class, [&$file]);
+        $sniffed = $sniffer->get_type();
+
+        return [$headers, $sniffed];
+    }
+
+    /**
+     * Get the error message for the occurred error
+     *
+     * @return string|array Error message, or array of messages for multifeeds
+     */
+    public function error()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Get the last HTTP status code
+     *
+     * @return int Status code
+     */
+    public function status_code()
+    {
+        return $this->status_code;
+    }
+
+    /**
+     * Get the raw XML
+     *
+     * This is the same as the old `$feed->enable_xml_dump(true)`, but returns
+     * the data instead of printing it.
+     *
+     * @return string|boolean Raw XML data, false if the cache is used
+     */
+    public function get_raw_data()
+    {
+        return $this->raw_data;
+    }
+
+    /**
+     * Get the character encoding used for output
+     *
+     * @since Preview Release
+     * @return string
+     */
+    public function get_encoding()
+    {
+        return $this->sanitize->output_encoding;
+    }
+
+    /**
+     * Send the content-type header with correct encoding
+     *
+     * This method ensures that the SimplePie-enabled page is being served with
+     * the correct {@link http://www.iana.org/assignments/media-types/ mime-type}
+     * and character encoding HTTP headers (character encoding determined by the
+     * {@see set_output_encoding} config option).
+     *
+     * This won't work properly if any content or whitespace has already been
+     * sent to the browser, because it relies on PHP's
+     * {@link http://php.net/header header()} function, and these are the
+     * circumstances under which the function works.
+     *
+     * Because it's setting these settings for the entire page (as is the nature
+     * of HTTP headers), this should only be used once per page (again, at the
+     * top).
+     *
+     * @param string $mime MIME type to serve the page as
+     */
+    public function handle_content_type($mime = 'text/html')
+    {
+        if (!headers_sent()) {
+            $header = "Content-type: $mime;";
+            if ($this->get_encoding()) {
+                $header .= ' charset=' . $this->get_encoding();
+            } else {
+                $header .= ' charset=UTF-8';
+            }
+            header($header);
+        }
+    }
+
+    /**
+     * Get the type of the feed
+     *
+     * This returns a \SimplePie\SimplePie::TYPE_* constant, which can be tested against
+     * using {@link http://php.net/language.operators.bitwise bitwise operators}
+     *
+     * @since 0.8 (usage changed to using constants in 1.0)
+     * @see \SimplePie\SimplePie::TYPE_NONE Unknown.
+     * @see \SimplePie\SimplePie::TYPE_RSS_090 RSS 0.90.
+     * @see \SimplePie\SimplePie::TYPE_RSS_091_NETSCAPE RSS 0.91 (Netscape).
+     * @see \SimplePie\SimplePie::TYPE_RSS_091_USERLAND RSS 0.91 (Userland).
+     * @see \SimplePie\SimplePie::TYPE_RSS_091 RSS 0.91.
+     * @see \SimplePie\SimplePie::TYPE_RSS_092 RSS 0.92.
+     * @see \SimplePie\SimplePie::TYPE_RSS_093 RSS 0.93.
+     * @see \SimplePie\SimplePie::TYPE_RSS_094 RSS 0.94.
+     * @see \SimplePie\SimplePie::TYPE_RSS_10 RSS 1.0.
+     * @see \SimplePie\SimplePie::TYPE_RSS_20 RSS 2.0.x.
+     * @see \SimplePie\SimplePie::TYPE_RSS_RDF RDF-based RSS.
+     * @see \SimplePie\SimplePie::TYPE_RSS_SYNDICATION Non-RDF-based RSS (truly intended as syndication format).
+     * @see \SimplePie\SimplePie::TYPE_RSS_ALL Any version of RSS.
+     * @see \SimplePie\SimplePie::TYPE_ATOM_03 Atom 0.3.
+     * @see \SimplePie\SimplePie::TYPE_ATOM_10 Atom 1.0.
+     * @see \SimplePie\SimplePie::TYPE_ATOM_ALL Any version of Atom.
+     * @see \SimplePie\SimplePie::TYPE_ALL Any known/supported feed type.
+     * @return int \SimplePie\SimplePie::TYPE_* constant
+     */
+    public function get_type()
+    {
+        if (!isset($this->data['type'])) {
+            $this->data['type'] = self::TYPE_ALL;
+            if (isset($this->data['child'][self::NAMESPACE_ATOM_10]['feed'])) {
+                $this->data['type'] &= self::TYPE_ATOM_10;
+            } elseif (isset($this->data['child'][self::NAMESPACE_ATOM_03]['feed'])) {
+                $this->data['type'] &= self::TYPE_ATOM_03;
+            } elseif (isset($this->data['child'][self::NAMESPACE_RDF]['RDF'])) {
+                if (isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][self::NAMESPACE_RSS_10]['channel'])
+                || isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][self::NAMESPACE_RSS_10]['image'])
+                || isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][self::NAMESPACE_RSS_10]['item'])
+                || isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][self::NAMESPACE_RSS_10]['textinput'])) {
+                    $this->data['type'] &= self::TYPE_RSS_10;
+                }
+                if (isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][self::NAMESPACE_RSS_090]['channel'])
+                || isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][self::NAMESPACE_RSS_090]['image'])
+                || isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][self::NAMESPACE_RSS_090]['item'])
+                || isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][self::NAMESPACE_RSS_090]['textinput'])) {
+                    $this->data['type'] &= self::TYPE_RSS_090;
+                }
+            } elseif (isset($this->data['child'][self::NAMESPACE_RSS_20]['rss'])) {
+                $this->data['type'] &= self::TYPE_RSS_ALL;
+                if (isset($this->data['child'][self::NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version'])) {
+                    switch (trim($this->data['child'][self::NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version'])) {
+                        case '0.91':
+                            $this->data['type'] &= self::TYPE_RSS_091;
+                            if (isset($this->data['child'][self::NAMESPACE_RSS_20]['rss'][0]['child'][self::NAMESPACE_RSS_20]['skiphours']['hour'][0]['data'])) {
+                                switch (trim($this->data['child'][self::NAMESPACE_RSS_20]['rss'][0]['child'][self::NAMESPACE_RSS_20]['skiphours']['hour'][0]['data'])) {
+                                    case '0':
+                                        $this->data['type'] &= self::TYPE_RSS_091_NETSCAPE;
+                                        break;
+
+                                    case '24':
+                                        $this->data['type'] &= self::TYPE_RSS_091_USERLAND;
+                                        break;
+                                }
+                            }
+                            break;
+
+                        case '0.92':
+                            $this->data['type'] &= self::TYPE_RSS_092;
+                            break;
+
+                        case '0.93':
+                            $this->data['type'] &= self::TYPE_RSS_093;
+                            break;
+
+                        case '0.94':
+                            $this->data['type'] &= self::TYPE_RSS_094;
+                            break;
+
+                        case '2.0':
+                            $this->data['type'] &= self::TYPE_RSS_20;
+                            break;
+                    }
+                }
+            } else {
+                $this->data['type'] = self::TYPE_NONE;
+            }
+        }
+        return $this->data['type'];
+    }
+
+    /**
+     * Get the URL for the feed
+     *
+     * When the 'permanent' mode is enabled, returns the original feed URL,
+     * except in the case of an `HTTP 301 Moved Permanently` status response,
+     * in which case the location of the first redirection is returned.
+     *
+     * When the 'permanent' mode is disabled (default),
+     * may or may not be different from the URL passed to {@see set_feed_url()},
+     * depending on whether auto-discovery was used, and whether there were
+     * any redirects along the way.
+     *
+     * @since Preview Release (previously called `get_feed_url()` since SimplePie 0.8.)
+     * @todo Support <itunes:new-feed-url>
+     * @todo Also, |atom:link|@rel=self
+     * @param bool $permanent Permanent mode to return only the original URL or the first redirection
+     * iff it is a 301 redirection
+     * @return string|null
+     */
+    public function subscribe_url($permanent = false)
+    {
+        if ($permanent) {
+            if ($this->permanent_url !== null) {
+                // sanitize encodes ampersands which are required when used in a url.
+                return str_replace(
+                    '&amp;',
+                    '&',
+                    $this->sanitize(
+                        $this->permanent_url,
+                        self::CONSTRUCT_IRI
+                    )
+                );
+            }
+        } else {
+            if ($this->feed_url !== null) {
+                return str_replace(
+                    '&amp;',
+                    '&',
+                    $this->sanitize(
+                        $this->feed_url,
+                        self::CONSTRUCT_IRI
+                    )
+                );
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get data for an feed-level element
+     *
+     * This method allows you to get access to ANY element/attribute that is a
+     * sub-element of the opening feed tag.
+     *
+     * The return value is an indexed array of elements matching the given
+     * namespace and tag name. Each element has `attribs`, `data` and `child`
+     * subkeys. For `attribs` and `child`, these contain namespace subkeys.
+     * `attribs` then has one level of associative name => value data (where
+     * `value` is a string) after the namespace. `child` has tag-indexed keys
+     * after the namespace, each member of which is an indexed array matching
+     * this same format.
+     *
+     * For example:
+     * <pre>
+     * // This is probably a bad example because we already support
+     * // <media:content> natively, but it shows you how to parse through
+     * // the nodes.
+     * $group = $item->get_item_tags(\SimplePie\SimplePie::NAMESPACE_MEDIARSS, 'group');
+     * $content = $group[0]['child'][\SimplePie\SimplePie::NAMESPACE_MEDIARSS]['content'];
+     * $file = $content[0]['attribs']['']['url'];
+     * echo $file;
+     * </pre>
+     *
+     * @since 1.0
+     * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+     * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+     * @param string $tag Tag name
+     * @return array
+     */
+    public function get_feed_tags($namespace, $tag)
+    {
+        $type = $this->get_type();
+        if ($type & self::TYPE_ATOM_10) {
+            if (isset($this->data['child'][self::NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag])) {
+                return $this->data['child'][self::NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
+            }
+        }
+        if ($type & self::TYPE_ATOM_03) {
+            if (isset($this->data['child'][self::NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag])) {
+                return $this->data['child'][self::NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
+            }
+        }
+        if ($type & self::TYPE_RSS_RDF) {
+            if (isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag])) {
+                return $this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
+            }
+        }
+        if ($type & self::TYPE_RSS_SYNDICATION) {
+            if (isset($this->data['child'][self::NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag])) {
+                return $this->data['child'][self::NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag];
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get data for an channel-level element
+     *
+     * This method allows you to get access to ANY element/attribute in the
+     * channel/header section of the feed.
+     *
+     * See {@see SimplePie::get_feed_tags()} for a description of the return value
+     *
+     * @since 1.0
+     * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+     * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+     * @param string $tag Tag name
+     * @return array
+     */
+    public function get_channel_tags($namespace, $tag)
+    {
+        $type = $this->get_type();
+        if ($type & self::TYPE_ATOM_ALL) {
+            if ($return = $this->get_feed_tags($namespace, $tag)) {
+                return $return;
+            }
+        }
+        if ($type & self::TYPE_RSS_10) {
+            if ($channel = $this->get_feed_tags(self::NAMESPACE_RSS_10, 'channel')) {
+                if (isset($channel[0]['child'][$namespace][$tag])) {
+                    return $channel[0]['child'][$namespace][$tag];
+                }
+            }
+        }
+        if ($type & self::TYPE_RSS_090) {
+            if ($channel = $this->get_feed_tags(self::NAMESPACE_RSS_090, 'channel')) {
+                if (isset($channel[0]['child'][$namespace][$tag])) {
+                    return $channel[0]['child'][$namespace][$tag];
+                }
+            }
+        }
+        if ($type & self::TYPE_RSS_SYNDICATION) {
+            if ($channel = $this->get_feed_tags(self::NAMESPACE_RSS_20, 'channel')) {
+                if (isset($channel[0]['child'][$namespace][$tag])) {
+                    return $channel[0]['child'][$namespace][$tag];
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get data for an channel-level element
+     *
+     * This method allows you to get access to ANY element/attribute in the
+     * image/logo section of the feed.
+     *
+     * See {@see SimplePie::get_feed_tags()} for a description of the return value
+     *
+     * @since 1.0
+     * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+     * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+     * @param string $tag Tag name
+     * @return array
+     */
+    public function get_image_tags($namespace, $tag)
+    {
+        $type = $this->get_type();
+        if ($type & self::TYPE_RSS_10) {
+            if ($image = $this->get_feed_tags(self::NAMESPACE_RSS_10, 'image')) {
+                if (isset($image[0]['child'][$namespace][$tag])) {
+                    return $image[0]['child'][$namespace][$tag];
+                }
+            }
+        }
+        if ($type & self::TYPE_RSS_090) {
+            if ($image = $this->get_feed_tags(self::NAMESPACE_RSS_090, 'image')) {
+                if (isset($image[0]['child'][$namespace][$tag])) {
+                    return $image[0]['child'][$namespace][$tag];
+                }
+            }
+        }
+        if ($type & self::TYPE_RSS_SYNDICATION) {
+            if ($image = $this->get_channel_tags(self::NAMESPACE_RSS_20, 'image')) {
+                if (isset($image[0]['child'][$namespace][$tag])) {
+                    return $image[0]['child'][$namespace][$tag];
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get the base URL value from the feed
+     *
+     * Uses `<xml:base>` if available, otherwise uses the first link in the
+     * feed, or failing that, the URL of the feed itself.
+     *
+     * @see get_link
+     * @see subscribe_url
+     *
+     * @param array $element
+     * @return string
+     */
+    public function get_base($element = [])
+    {
+        if (!empty($element['xml_base_explicit']) && isset($element['xml_base'])) {
+            return $element['xml_base'];
+        } elseif ($this->get_link() !== null) {
+            return $this->get_link();
+        }
+
+        return $this->subscribe_url();
+    }
+
+    /**
+     * Sanitize feed data
+     *
+     * @access private
+     * @see \SimplePie\Sanitize::sanitize()
+     * @param string $data Data to sanitize
+     * @param int $type One of the \SimplePie\SimplePie::CONSTRUCT_* constants
+     * @param string $base Base URL to resolve URLs against
+     * @return string Sanitized data
+     */
+    public function sanitize($data, $type, $base = '')
+    {
+        try {
+            return $this->sanitize->sanitize($data, $type, $base);
+        } catch (\SimplePie\Exception $e) {
+            if (!$this->enable_exceptions) {
+                $this->error = $e->getMessage();
+                $this->registry->call(Misc::class, 'error', [$this->error, E_USER_WARNING, $e->getFile(), $e->getLine()]);
+                return '';
+            }
+
+            throw $e;
+        }
+    }
+
+    /**
+     * Get the title of the feed
+     *
+     * Uses `<atom:title>`, `<title>` or `<dc:title>`
+     *
+     * @since 1.0 (previously called `get_feed_title` since 0.8)
+     * @return string|null
+     */
+    public function get_title()
+    {
+        if ($return = $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'title')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_ATOM_03, 'title')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_RSS_10, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_RSS_090, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_RSS_20, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_DC_11, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_DC_10, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a category for the feed
+     *
+     * @since Unknown
+     * @param int $key The category that you want to return. Remember that arrays begin with 0, not 1
+     * @return \SimplePie\Category|null
+     */
+    public function get_category($key = 0)
+    {
+        $categories = $this->get_categories();
+        if (isset($categories[$key])) {
+            return $categories[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all categories for the feed
+     *
+     * Uses `<atom:category>`, `<category>` or `<dc:subject>`
+     *
+     * @since Unknown
+     * @return array|null List of {@see \SimplePie\Category} objects
+     */
+    public function get_categories()
+    {
+        $categories = [];
+
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'category') as $category) {
+            $term = null;
+            $scheme = null;
+            $label = null;
+            if (isset($category['attribs']['']['term'])) {
+                $term = $this->sanitize($category['attribs']['']['term'], self::CONSTRUCT_TEXT);
+            }
+            if (isset($category['attribs']['']['scheme'])) {
+                $scheme = $this->sanitize($category['attribs']['']['scheme'], self::CONSTRUCT_TEXT);
+            }
+            if (isset($category['attribs']['']['label'])) {
+                $label = $this->sanitize($category['attribs']['']['label'], self::CONSTRUCT_TEXT);
+            }
+            $categories[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+        }
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_RSS_20, 'category') as $category) {
+            // This is really the label, but keep this as the term also for BC.
+            // Label will also work on retrieving because that falls back to term.
+            $term = $this->sanitize($category['data'], self::CONSTRUCT_TEXT);
+            if (isset($category['attribs']['']['domain'])) {
+                $scheme = $this->sanitize($category['attribs']['']['domain'], self::CONSTRUCT_TEXT);
+            } else {
+                $scheme = null;
+            }
+            $categories[] = $this->registry->create(Category::class, [$term, $scheme, null]);
+        }
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_DC_11, 'subject') as $category) {
+            $categories[] = $this->registry->create(Category::class, [$this->sanitize($category['data'], self::CONSTRUCT_TEXT), null, null]);
+        }
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_DC_10, 'subject') as $category) {
+            $categories[] = $this->registry->create(Category::class, [$this->sanitize($category['data'], self::CONSTRUCT_TEXT), null, null]);
+        }
+
+        if (!empty($categories)) {
+            return array_unique($categories);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get an author for the feed
+     *
+     * @since 1.1
+     * @param int $key The author that you want to return. Remember that arrays begin with 0, not 1
+     * @return \SimplePie\Author|null
+     */
+    public function get_author($key = 0)
+    {
+        $authors = $this->get_authors();
+        if (isset($authors[$key])) {
+            return $authors[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all authors for the feed
+     *
+     * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>`
+     *
+     * @since 1.1
+     * @return array|null List of {@see \SimplePie\Author} objects
+     */
+    public function get_authors()
+    {
+        $authors = [];
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'author') as $author) {
+            $name = null;
+            $uri = null;
+            $email = null;
+            if (isset($author['child'][self::NAMESPACE_ATOM_10]['name'][0]['data'])) {
+                $name = $this->sanitize($author['child'][self::NAMESPACE_ATOM_10]['name'][0]['data'], self::CONSTRUCT_TEXT);
+            }
+            if (isset($author['child'][self::NAMESPACE_ATOM_10]['uri'][0]['data'])) {
+                $uri = $this->sanitize($author['child'][self::NAMESPACE_ATOM_10]['uri'][0]['data'], self::CONSTRUCT_IRI, $this->get_base($author['child'][self::NAMESPACE_ATOM_10]['uri'][0]));
+            }
+            if (isset($author['child'][self::NAMESPACE_ATOM_10]['email'][0]['data'])) {
+                $email = $this->sanitize($author['child'][self::NAMESPACE_ATOM_10]['email'][0]['data'], self::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $uri !== null) {
+                $authors[] = $this->registry->create(Author::class, [$name, $uri, $email]);
+            }
+        }
+        if ($author = $this->get_channel_tags(self::NAMESPACE_ATOM_03, 'author')) {
+            $name = null;
+            $url = null;
+            $email = null;
+            if (isset($author[0]['child'][self::NAMESPACE_ATOM_03]['name'][0]['data'])) {
+                $name = $this->sanitize($author[0]['child'][self::NAMESPACE_ATOM_03]['name'][0]['data'], self::CONSTRUCT_TEXT);
+            }
+            if (isset($author[0]['child'][self::NAMESPACE_ATOM_03]['url'][0]['data'])) {
+                $url = $this->sanitize($author[0]['child'][self::NAMESPACE_ATOM_03]['url'][0]['data'], self::CONSTRUCT_IRI, $this->get_base($author[0]['child'][self::NAMESPACE_ATOM_03]['url'][0]));
+            }
+            if (isset($author[0]['child'][self::NAMESPACE_ATOM_03]['email'][0]['data'])) {
+                $email = $this->sanitize($author[0]['child'][self::NAMESPACE_ATOM_03]['email'][0]['data'], self::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $url !== null) {
+                $authors[] = $this->registry->create(Author::class, [$name, $url, $email]);
+            }
+        }
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_DC_11, 'creator') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], self::CONSTRUCT_TEXT), null, null]);
+        }
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_DC_10, 'creator') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], self::CONSTRUCT_TEXT), null, null]);
+        }
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_ITUNES, 'author') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], self::CONSTRUCT_TEXT), null, null]);
+        }
+
+        if (!empty($authors)) {
+            return array_unique($authors);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a contributor for the feed
+     *
+     * @since 1.1
+     * @param int $key The contrbutor that you want to return. Remember that arrays begin with 0, not 1
+     * @return \SimplePie\Author|null
+     */
+    public function get_contributor($key = 0)
+    {
+        $contributors = $this->get_contributors();
+        if (isset($contributors[$key])) {
+            return $contributors[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all contributors for the feed
+     *
+     * Uses `<atom:contributor>`
+     *
+     * @since 1.1
+     * @return array|null List of {@see \SimplePie\Author} objects
+     */
+    public function get_contributors()
+    {
+        $contributors = [];
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'contributor') as $contributor) {
+            $name = null;
+            $uri = null;
+            $email = null;
+            if (isset($contributor['child'][self::NAMESPACE_ATOM_10]['name'][0]['data'])) {
+                $name = $this->sanitize($contributor['child'][self::NAMESPACE_ATOM_10]['name'][0]['data'], self::CONSTRUCT_TEXT);
+            }
+            if (isset($contributor['child'][self::NAMESPACE_ATOM_10]['uri'][0]['data'])) {
+                $uri = $this->sanitize($contributor['child'][self::NAMESPACE_ATOM_10]['uri'][0]['data'], self::CONSTRUCT_IRI, $this->get_base($contributor['child'][self::NAMESPACE_ATOM_10]['uri'][0]));
+            }
+            if (isset($contributor['child'][self::NAMESPACE_ATOM_10]['email'][0]['data'])) {
+                $email = $this->sanitize($contributor['child'][self::NAMESPACE_ATOM_10]['email'][0]['data'], self::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $uri !== null) {
+                $contributors[] = $this->registry->create(Author::class, [$name, $uri, $email]);
+            }
+        }
+        foreach ((array) $this->get_channel_tags(self::NAMESPACE_ATOM_03, 'contributor') as $contributor) {
+            $name = null;
+            $url = null;
+            $email = null;
+            if (isset($contributor['child'][self::NAMESPACE_ATOM_03]['name'][0]['data'])) {
+                $name = $this->sanitize($contributor['child'][self::NAMESPACE_ATOM_03]['name'][0]['data'], self::CONSTRUCT_TEXT);
+            }
+            if (isset($contributor['child'][self::NAMESPACE_ATOM_03]['url'][0]['data'])) {
+                $url = $this->sanitize($contributor['child'][self::NAMESPACE_ATOM_03]['url'][0]['data'], self::CONSTRUCT_IRI, $this->get_base($contributor['child'][self::NAMESPACE_ATOM_03]['url'][0]));
+            }
+            if (isset($contributor['child'][self::NAMESPACE_ATOM_03]['email'][0]['data'])) {
+                $email = $this->sanitize($contributor['child'][self::NAMESPACE_ATOM_03]['email'][0]['data'], self::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $url !== null) {
+                $contributors[] = $this->registry->create(Author::class, [$name, $url, $email]);
+            }
+        }
+
+        if (!empty($contributors)) {
+            return array_unique($contributors);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a single link for the feed
+     *
+     * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8)
+     * @param int $key The link that you want to return. Remember that arrays begin with 0, not 1
+     * @param string $rel The relationship of the link to return
+     * @return string|null Link URL
+     */
+    public function get_link($key = 0, $rel = 'alternate')
+    {
+        $links = $this->get_links($rel);
+        if (isset($links[$key])) {
+            return $links[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the permalink for the item
+     *
+     * Returns the first link available with a relationship of "alternate".
+     * Identical to {@see get_link()} with key 0
+     *
+     * @see get_link
+     * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8)
+     * @internal Added for parity between the parent-level and the item/entry-level.
+     * @return string|null Link URL
+     */
+    public function get_permalink()
+    {
+        return $this->get_link(0);
+    }
+
+    /**
+     * Get all links for the feed
+     *
+     * Uses `<atom:link>` or `<link>`
+     *
+     * @since Beta 2
+     * @param string $rel The relationship of links to return
+     * @return array|null Links found for the feed (strings)
+     */
+    public function get_links($rel = 'alternate')
+    {
+        if (!isset($this->data['links'])) {
+            $this->data['links'] = [];
+            if ($links = $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'link')) {
+                foreach ($links as $link) {
+                    if (isset($link['attribs']['']['href'])) {
+                        $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+                        $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], self::CONSTRUCT_IRI, $this->get_base($link));
+                    }
+                }
+            }
+            if ($links = $this->get_channel_tags(self::NAMESPACE_ATOM_03, 'link')) {
+                foreach ($links as $link) {
+                    if (isset($link['attribs']['']['href'])) {
+                        $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+                        $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], self::CONSTRUCT_IRI, $this->get_base($link));
+                    }
+                }
+            }
+            if ($links = $this->get_channel_tags(self::NAMESPACE_RSS_10, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], self::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+            if ($links = $this->get_channel_tags(self::NAMESPACE_RSS_090, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], self::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+            if ($links = $this->get_channel_tags(self::NAMESPACE_RSS_20, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], self::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+
+            $keys = array_keys($this->data['links']);
+            foreach ($keys as $key) {
+                if ($this->registry->call(Misc::class, 'is_isegment_nz_nc', [$key])) {
+                    if (isset($this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key])) {
+                        $this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key]);
+                        $this->data['links'][$key] = &$this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key];
+                    } else {
+                        $this->data['links'][self::IANA_LINK_RELATIONS_REGISTRY . $key] = &$this->data['links'][$key];
+                    }
+                } elseif (substr($key, 0, 41) === self::IANA_LINK_RELATIONS_REGISTRY) {
+                    $this->data['links'][substr($key, 41)] = &$this->data['links'][$key];
+                }
+                $this->data['links'][$key] = array_unique($this->data['links'][$key]);
+            }
+        }
+
+        if (isset($this->data['headers']['link'])) {
+            $link_headers = $this->data['headers']['link'];
+            if (is_array($link_headers)) {
+                $link_headers = implode(',', $link_headers);
+            }
+            // https://datatracker.ietf.org/doc/html/rfc8288
+            if (is_string($link_headers) &&
+                preg_match_all('/<(?P<uri>[^>]+)>\s*;\s*rel\s*=\s*(?P<quote>"?)' . preg_quote($rel) . '(?P=quote)\s*(?=,|$)/i', $link_headers, $matches)) {
+                return $matches['uri'];
+            }
+        }
+
+        if (isset($this->data['links'][$rel])) {
+            return $this->data['links'][$rel];
+        }
+
+        return null;
+    }
+
+    public function get_all_discovered_feeds()
+    {
+        return $this->all_discovered_feeds;
+    }
+
+    /**
+     * Get the content for the item
+     *
+     * Uses `<atom:subtitle>`, `<atom:tagline>`, `<description>`,
+     * `<dc:description>`, `<itunes:summary>` or `<itunes:subtitle>`
+     *
+     * @since 1.0 (previously called `get_feed_description()` since 0.8)
+     * @return string|null
+     */
+    public function get_description()
+    {
+        if ($return = $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'subtitle')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_ATOM_03, 'tagline')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_RSS_10, 'description')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_RSS_090, 'description')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_RSS_20, 'description')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_DC_11, 'description')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_DC_10, 'description')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_ITUNES, 'summary')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_ITUNES, 'subtitle')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_HTML, $this->get_base($return[0]));
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the copyright info for the feed
+     *
+     * Uses `<atom:rights>`, `<atom:copyright>` or `<dc:rights>`
+     *
+     * @since 1.0 (previously called `get_feed_copyright()` since 0.8)
+     * @return string|null
+     */
+    public function get_copyright()
+    {
+        if ($return = $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'rights')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_ATOM_03, 'copyright')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_RSS_20, 'copyright')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_DC_11, 'rights')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_DC_10, 'rights')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the language for the feed
+     *
+     * Uses `<language>`, `<dc:language>`, or @xml_lang
+     *
+     * @since 1.0 (previously called `get_feed_language()` since 0.8)
+     * @return string|null
+     */
+    public function get_language()
+    {
+        if ($return = $this->get_channel_tags(self::NAMESPACE_RSS_20, 'language')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_DC_11, 'language')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_DC_10, 'language')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif (isset($this->data['child'][self::NAMESPACE_ATOM_10]['feed'][0]['xml_lang'])) {
+            return $this->sanitize($this->data['child'][self::NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], self::CONSTRUCT_TEXT);
+        } elseif (isset($this->data['child'][self::NAMESPACE_ATOM_03]['feed'][0]['xml_lang'])) {
+            return $this->sanitize($this->data['child'][self::NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], self::CONSTRUCT_TEXT);
+        } elseif (isset($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['xml_lang'])) {
+            return $this->sanitize($this->data['child'][self::NAMESPACE_RDF]['RDF'][0]['xml_lang'], self::CONSTRUCT_TEXT);
+        } elseif (isset($this->data['headers']['content-language'])) {
+            return $this->sanitize($this->data['headers']['content-language'], self::CONSTRUCT_TEXT);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the latitude coordinates for the item
+     *
+     * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+     *
+     * Uses `<geo:lat>` or `<georss:point>`
+     *
+     * @since 1.0
+     * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+     * @link http://www.georss.org/ GeoRSS
+     * @return string|null
+     */
+    public function get_latitude()
+    {
+        if ($return = $this->get_channel_tags(self::NAMESPACE_W3C_BASIC_GEO, 'lat')) {
+            return (float) $return[0]['data'];
+        } elseif (($return = $this->get_channel_tags(self::NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) {
+            return (float) $match[1];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the longitude coordinates for the feed
+     *
+     * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+     *
+     * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>`
+     *
+     * @since 1.0
+     * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+     * @link http://www.georss.org/ GeoRSS
+     * @return string|null
+     */
+    public function get_longitude()
+    {
+        if ($return = $this->get_channel_tags(self::NAMESPACE_W3C_BASIC_GEO, 'long')) {
+            return (float) $return[0]['data'];
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_W3C_BASIC_GEO, 'lon')) {
+            return (float) $return[0]['data'];
+        } elseif (($return = $this->get_channel_tags(self::NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) {
+            return (float) $match[2];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the feed logo's title
+     *
+     * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" title.
+     *
+     * Uses `<image><title>` or `<image><dc:title>`
+     *
+     * @return string|null
+     */
+    public function get_image_title()
+    {
+        if ($return = $this->get_image_tags(self::NAMESPACE_RSS_10, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_RSS_090, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_RSS_20, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_DC_11, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_DC_10, 'title')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_TEXT);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the feed logo's URL
+     *
+     * RSS 0.9.0, 2.0, Atom 1.0, and feeds with iTunes RSS tags are allowed to
+     * have a "feed logo" URL. This points directly to the image itself.
+     *
+     * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`,
+     * `<image><title>` or `<image><dc:title>`
+     *
+     * @return string|null
+     */
+    public function get_image_url()
+    {
+        if ($return = $this->get_channel_tags(self::NAMESPACE_ITUNES, 'image')) {
+            return $this->sanitize($return[0]['attribs']['']['href'], self::CONSTRUCT_IRI);
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'logo')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_IRI, $this->get_base($return[0]));
+        } elseif ($return = $this->get_channel_tags(self::NAMESPACE_ATOM_10, 'icon')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_IRI, $this->get_base($return[0]));
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_RSS_10, 'url')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_IRI, $this->get_base($return[0]));
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_RSS_090, 'url')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_IRI, $this->get_base($return[0]));
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_RSS_20, 'url')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_IRI, $this->get_base($return[0]));
+        }
+
+        return null;
+    }
+
+
+    /**
+     * Get the feed logo's link
+     *
+     * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" link. This
+     * points to a human-readable page that the image should link to.
+     *
+     * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`,
+     * `<image><title>` or `<image><dc:title>`
+     *
+     * @return string|null
+     */
+    public function get_image_link()
+    {
+        if ($return = $this->get_image_tags(self::NAMESPACE_RSS_10, 'link')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_IRI, $this->get_base($return[0]));
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_RSS_090, 'link')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_IRI, $this->get_base($return[0]));
+        } elseif ($return = $this->get_image_tags(self::NAMESPACE_RSS_20, 'link')) {
+            return $this->sanitize($return[0]['data'], self::CONSTRUCT_IRI, $this->get_base($return[0]));
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the feed logo's link
+     *
+     * RSS 2.0 feeds are allowed to have a "feed logo" width.
+     *
+     * Uses `<image><width>` or defaults to 88 if no width is specified and
+     * the feed is an RSS 2.0 feed.
+     *
+     * @return int|null
+     */
+    public function get_image_width()
+    {
+        if ($return = $this->get_image_tags(self::NAMESPACE_RSS_20, 'width')) {
+            return intval($return[0]['data']);
+        } elseif ($this->get_type() & self::TYPE_RSS_SYNDICATION && $this->get_image_tags(self::NAMESPACE_RSS_20, 'url')) {
+            return 88;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the feed logo's height
+     *
+     * RSS 2.0 feeds are allowed to have a "feed logo" height.
+     *
+     * Uses `<image><height>` or defaults to 31 if no height is specified and
+     * the feed is an RSS 2.0 feed.
+     *
+     * @return int|null
+     */
+    public function get_image_height()
+    {
+        if ($return = $this->get_image_tags(self::NAMESPACE_RSS_20, 'height')) {
+            return intval($return[0]['data']);
+        } elseif ($this->get_type() & self::TYPE_RSS_SYNDICATION && $this->get_image_tags(self::NAMESPACE_RSS_20, 'url')) {
+            return 31;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the number of items in the feed
+     *
+     * This is well-suited for {@link http://php.net/for for()} loops with
+     * {@see get_item()}
+     *
+     * @param int $max Maximum value to return. 0 for no limit
+     * @return int Number of items in the feed
+     */
+    public function get_item_quantity($max = 0)
+    {
+        $max = (int) $max;
+        $qty = count($this->get_items());
+        if ($max === 0) {
+            return $qty;
+        }
+
+        return ($qty > $max) ? $max : $qty;
+    }
+
+    /**
+     * Get a single item from the feed
+     *
+     * This is better suited for {@link http://php.net/for for()} loops, whereas
+     * {@see get_items()} is better suited for
+     * {@link http://php.net/foreach foreach()} loops.
+     *
+     * @see get_item_quantity()
+     * @since Beta 2
+     * @param int $key The item that you want to return. Remember that arrays begin with 0, not 1
+     * @return \SimplePie\Item|null
+     */
+    public function get_item($key = 0)
+    {
+        $items = $this->get_items();
+        if (isset($items[$key])) {
+            return $items[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all items from the feed
+     *
+     * This is better suited for {@link http://php.net/for for()} loops, whereas
+     * {@see get_items()} is better suited for
+     * {@link http://php.net/foreach foreach()} loops.
+     *
+     * @see get_item_quantity
+     * @since Beta 2
+     * @param int $start Index to start at
+     * @param int $end Number of items to return. 0 for all items after `$start`
+     * @return \SimplePie\Item[]|null List of {@see \SimplePie\Item} objects
+     */
+    public function get_items($start = 0, $end = 0)
+    {
+        if (!isset($this->data['items'])) {
+            if (!empty($this->multifeed_objects)) {
+                $this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
+                if (empty($this->data['items'])) {
+                    return [];
+                }
+                return $this->data['items'];
+            }
+            $this->data['items'] = [];
+            if ($items = $this->get_feed_tags(self::NAMESPACE_ATOM_10, 'entry')) {
+                $keys = array_keys($items);
+                foreach ($keys as $key) {
+                    $this->data['items'][] = $this->registry->create(Item::class, [$this, $items[$key]]);
+                }
+            }
+            if ($items = $this->get_feed_tags(self::NAMESPACE_ATOM_03, 'entry')) {
+                $keys = array_keys($items);
+                foreach ($keys as $key) {
+                    $this->data['items'][] = $this->registry->create(Item::class, [$this, $items[$key]]);
+                }
+            }
+            if ($items = $this->get_feed_tags(self::NAMESPACE_RSS_10, 'item')) {
+                $keys = array_keys($items);
+                foreach ($keys as $key) {
+                    $this->data['items'][] = $this->registry->create(Item::class, [$this, $items[$key]]);
+                }
+            }
+            if ($items = $this->get_feed_tags(self::NAMESPACE_RSS_090, 'item')) {
+                $keys = array_keys($items);
+                foreach ($keys as $key) {
+                    $this->data['items'][] = $this->registry->create(Item::class, [$this, $items[$key]]);
+                }
+            }
+            if ($items = $this->get_channel_tags(self::NAMESPACE_RSS_20, 'item')) {
+                $keys = array_keys($items);
+                foreach ($keys as $key) {
+                    $this->data['items'][] = $this->registry->create(Item::class, [$this, $items[$key]]);
+                }
+            }
+        }
+
+        if (empty($this->data['items'])) {
+            return [];
+        }
+
+        if ($this->order_by_date) {
+            if (!isset($this->data['ordered_items'])) {
+                $this->data['ordered_items'] = $this->data['items'];
+                usort($this->data['ordered_items'], [get_class($this), 'sort_items']);
+            }
+            $items = $this->data['ordered_items'];
+        } else {
+            $items = $this->data['items'];
+        }
+        // Slice the data as desired
+        if ($end === 0) {
+            return array_slice($items, $start);
+        }
+
+        return array_slice($items, $start, $end);
+    }
+
+    /**
+     * Set the favicon handler
+     *
+     * @deprecated Use your own favicon handling instead
+     */
+    public function set_favicon_handler($page = false, $qs = 'i')
+    {
+        trigger_error('Favicon handling has been removed, please use your own handling', \E_USER_DEPRECATED);
+        return false;
+    }
+
+    /**
+     * Get the favicon for the current feed
+     *
+     * @deprecated Use your own favicon handling instead
+     */
+    public function get_favicon()
+    {
+        trigger_error('Favicon handling has been removed, please use your own handling', \E_USER_DEPRECATED);
+
+        if (($url = $this->get_link()) !== null) {
+            return 'https://www.google.com/s2/favicons?domain=' . urlencode($url);
+        }
+
+        return false;
+    }
+
+    /**
+     * Magic method handler
+     *
+     * @param string $method Method name
+     * @param array $args Arguments to the method
+     * @return mixed
+     */
+    public function __call($method, $args)
+    {
+        if (strpos($method, 'subscribe_') === 0) {
+            trigger_error('subscribe_*() has been deprecated, implement the callback yourself', \E_USER_DEPRECATED);
+            return '';
+        }
+        if ($method === 'enable_xml_dump') {
+            trigger_error('enable_xml_dump() has been deprecated, use get_raw_data() instead', \E_USER_DEPRECATED);
+            return false;
+        }
+
+        $class = get_class($this);
+        $trace = debug_backtrace(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection
+        $file = $trace[0]['file'];
+        $line = $trace[0]['line'];
+        throw new SimplePieException("Call to undefined method $class::$method() in $file on line $line");
+    }
+
+    /**
+     * Sorting callback for items
+     *
+     * @access private
+     * @param SimplePie $a
+     * @param SimplePie $b
+     * @return boolean
+     */
+    public static function sort_items($a, $b)
+    {
+        $a_date = $a->get_date('U');
+        $b_date = $b->get_date('U');
+        if ($a_date && $b_date) {
+            return $a_date > $b_date ? -1 : 1;
+        }
+        // Sort items without dates to the top.
+        if ($a_date) {
+            return 1;
+        }
+        if ($b_date) {
+            return -1;
+        }
+        return 0;
+    }
+
+    /**
+     * Merge items from several feeds into one
+     *
+     * If you're merging multiple feeds together, they need to all have dates
+     * for the items or else SimplePie will refuse to sort them.
+     *
+     * @link http://simplepie.org/wiki/tutorial/sort_multiple_feeds_by_time_and_date#if_feeds_require_separate_per-feed_settings
+     * @param array $urls List of SimplePie feed objects to merge
+     * @param int $start Starting item
+     * @param int $end Number of items to return
+     * @param int $limit Maximum number of items per feed
+     * @return array
+     */
+    public static function merge_items($urls, $start = 0, $end = 0, $limit = 0)
+    {
+        if (is_array($urls) && sizeof($urls) > 0) {
+            $items = [];
+            foreach ($urls as $arg) {
+                if ($arg instanceof SimplePie) {
+                    $items = array_merge($items, $arg->get_items(0, $limit));
+                } else {
+                    trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
+                }
+            }
+
+            usort($items, [get_class($urls[0]), 'sort_items']);
+
+            if ($end === 0) {
+                return array_slice($items, $start);
+            }
+
+            return array_slice($items, $start, $end);
+        }
+
+        trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
+        return [];
+    }
+
+    /**
+     * Store PubSubHubbub links as headers
+     *
+     * There is no way to find PuSH links in the body of a microformats feed,
+     * so they are added to the headers when found, to be used later by get_links.
+     * @param \SimplePie\File $file
+     * @param string $hub
+     * @param string $self
+     */
+    private function store_links(&$file, $hub, $self)
+    {
+        if (isset($file->headers['link']['hub']) ||
+              (isset($file->headers['link']) &&
+               preg_match('/rel=hub/', $file->headers['link']))) {
+            return;
+        }
+
+        if ($hub) {
+            if (isset($file->headers['link'])) {
+                if ($file->headers['link'] !== '') {
+                    $file->headers['link'] = ', ';
+                }
+            } else {
+                $file->headers['link'] = '';
+            }
+            $file->headers['link'] .= '<'.$hub.'>; rel=hub';
+            if ($self) {
+                $file->headers['link'] .= ', <'.$self.'>; rel=self';
+            }
+        }
+    }
+
+    /**
+     * Get a DataCache
+     *
+     * @param string $feed_url Only needed for BC, can be removed in SimplePie 2.0.0
+     *
+     * @return DataCache
+     */
+    private function get_cache($feed_url = '')
+    {
+        if ($this->cache === null) {
+            // @trigger_error(sprintf('Not providing as PSR-16 cache implementation is deprecated since SimplePie 1.8.0, please use "SimplePie\SimplePie::set_cache()".'), \E_USER_DEPRECATED);
+            $cache = $this->registry->call(Cache::class, 'get_handler', [
+                $this->cache_location,
+                $this->get_cache_filename($feed_url),
+                Base::TYPE_FEED
+            ]);
+
+            return new BaseDataCache($cache);
+        }
+
+        return $this->cache;
+    }
+}
+
+class_alias('SimplePie\SimplePie', 'SimplePie');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcSourcephpfromrev59140trunksrcwpincludesSimplePieSourcephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/Source.php (from rev 59140, trunk/src/wp-includes/SimplePie/Source.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/Source.php                            (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/Source.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,463 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Handles `<atom:source>`
+ *
+ * Used by {@see \SimplePie\Item::get_source()}
+ *
+ * This class can be overloaded with {@see \SimplePie::set_source_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class Source implements RegistryAware
+{
+    public $item;
+    public $data = [];
+    protected $registry;
+
+    public function __construct($item, $data)
+    {
+        $this->item = $item;
+        $this->data = $data;
+    }
+
+    public function set_registry(\SimplePie\Registry $registry)/* : void */
+    {
+        $this->registry = $registry;
+    }
+
+    public function __toString()
+    {
+        return md5(serialize($this->data));
+    }
+
+    public function get_source_tags($namespace, $tag)
+    {
+        if (isset($this->data['child'][$namespace][$tag])) {
+            return $this->data['child'][$namespace][$tag];
+        }
+
+        return null;
+    }
+
+    public function get_base($element = [])
+    {
+        return $this->item->get_base($element);
+    }
+
+    public function sanitize($data, $type, $base = '')
+    {
+        return $this->item->sanitize($data, $type, $base);
+    }
+
+    public function get_item()
+    {
+        return $this->item;
+    }
+
+    public function get_title()
+    {
+        if ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'title')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'title')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_10, 'title')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_090, 'title')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'title')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'title')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'title')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        }
+
+        return null;
+    }
+
+    public function get_category($key = 0)
+    {
+        $categories = $this->get_categories();
+        if (isset($categories[$key])) {
+            return $categories[$key];
+        }
+
+        return null;
+    }
+
+    public function get_categories()
+    {
+        $categories = [];
+
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'category') as $category) {
+            $term = null;
+            $scheme = null;
+            $label = null;
+            if (isset($category['attribs']['']['term'])) {
+                $term = $this->sanitize($category['attribs']['']['term'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($category['attribs']['']['scheme'])) {
+                $scheme = $this->sanitize($category['attribs']['']['scheme'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($category['attribs']['']['label'])) {
+                $label = $this->sanitize($category['attribs']['']['label'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            $categories[] = $this->registry->create(Category::class, [$term, $scheme, $label]);
+        }
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'category') as $category) {
+            // This is really the label, but keep this as the term also for BC.
+            // Label will also work on retrieving because that falls back to term.
+            $term = $this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            if (isset($category['attribs']['']['domain'])) {
+                $scheme = $this->sanitize($category['attribs']['']['domain'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            } else {
+                $scheme = null;
+            }
+            $categories[] = $this->registry->create(Category::class, [$term, $scheme, null]);
+        }
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'subject') as $category) {
+            $categories[] = $this->registry->create(Category::class, [$this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null]);
+        }
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'subject') as $category) {
+            $categories[] = $this->registry->create(Category::class, [$this->sanitize($category['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null]);
+        }
+
+        if (!empty($categories)) {
+            return array_unique($categories);
+        }
+
+        return null;
+    }
+
+    public function get_author($key = 0)
+    {
+        $authors = $this->get_authors();
+        if (isset($authors[$key])) {
+            return $authors[$key];
+        }
+
+        return null;
+    }
+
+    public function get_authors()
+    {
+        $authors = [];
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'author') as $author) {
+            $name = null;
+            $uri = null;
+            $email = null;
+            if (isset($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['name'][0]['data'])) {
+                $name = $this->sanitize($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['name'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]['data'])) {
+                $uri = $this->sanitize($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]));
+            }
+            if (isset($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['email'][0]['data'])) {
+                $email = $this->sanitize($author['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['email'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $uri !== null) {
+                $authors[] = $this->registry->create(Author::class, [$name, $uri, $email]);
+            }
+        }
+        if ($author = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'author')) {
+            $name = null;
+            $url = null;
+            $email = null;
+            if (isset($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['name'][0]['data'])) {
+                $name = $this->sanitize($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['name'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]['data'])) {
+                $url = $this->sanitize($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]));
+            }
+            if (isset($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['email'][0]['data'])) {
+                $email = $this->sanitize($author[0]['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['email'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $url !== null) {
+                $authors[] = $this->registry->create(Author::class, [$name, $url, $email]);
+            }
+        }
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'creator') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null]);
+        }
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'creator') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null]);
+        }
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'author') as $author) {
+            $authors[] = $this->registry->create(Author::class, [$this->sanitize($author['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT), null, null]);
+        }
+
+        if (!empty($authors)) {
+            return array_unique($authors);
+        }
+
+        return null;
+    }
+
+    public function get_contributor($key = 0)
+    {
+        $contributors = $this->get_contributors();
+        if (isset($contributors[$key])) {
+            return $contributors[$key];
+        }
+
+        return null;
+    }
+
+    public function get_contributors()
+    {
+        $contributors = [];
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'contributor') as $contributor) {
+            $name = null;
+            $uri = null;
+            $email = null;
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['name'][0]['data'])) {
+                $name = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['name'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]['data'])) {
+                $uri = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['uri'][0]));
+            }
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['email'][0]['data'])) {
+                $email = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_10]['email'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $uri !== null) {
+                $contributors[] = $this->registry->create(Author::class, [$name, $uri, $email]);
+            }
+        }
+        foreach ((array) $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'contributor') as $contributor) {
+            $name = null;
+            $url = null;
+            $email = null;
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['name'][0]['data'])) {
+                $name = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['name'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]['data'])) {
+                $url = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['url'][0]));
+            }
+            if (isset($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['email'][0]['data'])) {
+                $email = $this->sanitize($contributor['child'][\SimplePie\SimplePie::NAMESPACE_ATOM_03]['email'][0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+            }
+            if ($name !== null || $email !== null || $url !== null) {
+                $contributors[] = $this->registry->create(Author::class, [$name, $url, $email]);
+            }
+        }
+
+        if (!empty($contributors)) {
+            return array_unique($contributors);
+        }
+
+        return null;
+    }
+
+    public function get_link($key = 0, $rel = 'alternate')
+    {
+        $links = $this->get_links($rel);
+        if (isset($links[$key])) {
+            return $links[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Added for parity between the parent-level and the item/entry-level.
+     */
+    public function get_permalink()
+    {
+        return $this->get_link(0);
+    }
+
+    public function get_links($rel = 'alternate')
+    {
+        if (!isset($this->data['links'])) {
+            $this->data['links'] = [];
+            if ($links = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'link')) {
+                foreach ($links as $link) {
+                    if (isset($link['attribs']['']['href'])) {
+                        $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+                        $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($link));
+                    }
+                }
+            }
+            if ($links = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'link')) {
+                foreach ($links as $link) {
+                    if (isset($link['attribs']['']['href'])) {
+                        $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+                        $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($link));
+                    }
+                }
+            }
+            if ($links = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_10, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+            if ($links = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_090, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+            if ($links = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'link')) {
+                $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($links[0]));
+            }
+
+            $keys = array_keys($this->data['links']);
+            foreach ($keys as $key) {
+                if ($this->registry->call(Misc::class, 'is_isegment_nz_nc', [$key])) {
+                    if (isset($this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key])) {
+                        $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key]);
+                        $this->data['links'][$key] = &$this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key];
+                    } else {
+                        $this->data['links'][\SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY . $key] = &$this->data['links'][$key];
+                    }
+                } elseif (substr($key, 0, 41) === \SimplePie\SimplePie::IANA_LINK_RELATIONS_REGISTRY) {
+                    $this->data['links'][substr($key, 41)] = &$this->data['links'][$key];
+                }
+                $this->data['links'][$key] = array_unique($this->data['links'][$key]);
+            }
+        }
+
+        if (isset($this->data['links'][$rel])) {
+            return $this->data['links'][$rel];
+        }
+
+        return null;
+    }
+
+    public function get_description()
+    {
+        if ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'subtitle')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'tagline')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_10, 'description')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_090, 'description')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'description')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'description')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'description')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'summary')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_HTML, $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'subtitle')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_HTML, $this->get_base($return[0]));
+        }
+
+        return null;
+    }
+
+    public function get_copyright()
+    {
+        if ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'rights')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_10_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_03, 'copyright')) {
+            return $this->sanitize($return[0]['data'], $this->registry->call(Misc::class, 'atom_03_construct_type', [$return[0]['attribs']]), $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'copyright')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'rights')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'rights')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        }
+
+        return null;
+    }
+
+    public function get_language()
+    {
+        if ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_RSS_20, 'language')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_11, 'language')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_DC_10, 'language')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        } elseif (isset($this->data['xml_lang'])) {
+            return $this->sanitize($this->data['xml_lang'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
+        }
+
+        return null;
+    }
+
+    public function get_latitude()
+    {
+        if ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_W3C_BASIC_GEO, 'lat')) {
+            return (float) $return[0]['data'];
+        } elseif (($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) {
+            return (float) $match[1];
+        }
+
+        return null;
+    }
+
+    public function get_longitude()
+    {
+        if ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_W3C_BASIC_GEO, 'long')) {
+            return (float) $return[0]['data'];
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_W3C_BASIC_GEO, 'lon')) {
+            return (float) $return[0]['data'];
+        } elseif (($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) {
+            return (float) $match[2];
+        }
+
+        return null;
+    }
+
+    public function get_image_url()
+    {
+        if ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ITUNES, 'image')) {
+            return $this->sanitize($return[0]['attribs']['']['href'], \SimplePie\SimplePie::CONSTRUCT_IRI);
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'logo')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($return[0]));
+        } elseif ($return = $this->get_source_tags(\SimplePie\SimplePie::NAMESPACE_ATOM_10, 'icon')) {
+            return $this->sanitize($return[0]['data'], \SimplePie\SimplePie::CONSTRUCT_IRI, $this->get_base($return[0]));
+        }
+
+        return null;
+    }
+}
+
+class_alias('SimplePie\Source', 'SimplePie_Source');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcXMLDeclarationParserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/SimplePie/src/XML/Declaration/Parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/XML/Declaration/Parser.php        2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/SimplePie/src/XML/Declaration/Parser.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * A PHP-Based RSS and Atom Feed Framework.
</span><span class="cx" style="display: block; padding: 0 10px">  * Takes the hard work out of managing a complete RSS/Atom solution.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
</ins><span class="cx" style="display: block; padding: 0 10px">  * All rights reserved.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * Redistribution and use in source and binary forms, with or without modification, are
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace SimplePie\XML\Declaration;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Parses the XML Declaration
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,312 +50,294 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @package SimplePie
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Parsing
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class SimplePie_XML_Declaration_Parser
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Parser
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * XML Version
-        *
-        * @access public
-        * @var string
-        */
-       var $version = '1.0';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * XML Version
+     *
+     * @access public
+     * @var string
+     */
+    public $version = '1.0';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Encoding
-        *
-        * @access public
-        * @var string
-        */
-       var $encoding = 'UTF-8';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Encoding
+     *
+     * @access public
+     * @var string
+     */
+    public $encoding = 'UTF-8';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Standalone
-        *
-        * @access public
-        * @var bool
-        */
-       var $standalone = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Standalone
+     *
+     * @access public
+     * @var bool
+     */
+    public $standalone = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Current state of the state machine
-        *
-        * @access private
-        * @var string
-        */
-       var $state = 'before_version_name';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_BEFORE_VERSION_NAME = 'before_version_name';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Input data
-        *
-        * @access private
-        * @var string
-        */
-       var $data = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_VERSION_NAME = 'version_name';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Input data length (to avoid calling strlen() everytime this is needed)
-        *
-        * @access private
-        * @var int
-        */
-       var $data_length = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_VERSION_EQUALS = 'version_equals';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Current position of the pointer
-        *
-        * @var int
-        * @access private
-        */
-       var $position = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_VERSION_VALUE = 'version_value';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create an instance of the class with the input data
-        *
-        * @access public
-        * @param string $data Input data
-        */
-       public function __construct($data)
-       {
-               $this->data = $data;
-               $this->data_length = strlen($this->data);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_ENCODING_NAME = 'encoding_name';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse the input data
-        *
-        * @access public
-        * @return bool true on success, false on failure
-        */
-       public function parse()
-       {
-               while ($this->state && $this->state !== 'emit' && $this->has_data())
-               {
-                       $state = $this->state;
-                       $this->$state();
-               }
-               $this->data = '';
-               if ($this->state === 'emit')
-               {
-                       return true;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_EMIT = 'emit';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->version = '';
-               $this->encoding = '';
-               $this->standalone = '';
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_ENCODING_EQUALS = 'encoding_equals';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Check whether there is data beyond the pointer
-        *
-        * @access private
-        * @return bool true if there is further data, false if not
-        */
-       public function has_data()
-       {
-               return (bool) ($this->position < $this->data_length);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_STANDALONE_NAME = 'standalone_name';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Advance past any whitespace
-        *
-        * @return int Number of whitespace characters passed
-        */
-       public function skip_whitespace()
-       {
-               $whitespace = strspn($this->data, "\x09\x0A\x0D\x20", $this->position);
-               $this->position += $whitespace;
-               return $whitespace;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_ENCODING_VALUE = 'encoding_value';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Read value
-        */
-       public function get_value()
-       {
-               $quote = substr($this->data, $this->position, 1);
-               if ($quote === '"' || $quote === "'")
-               {
-                       $this->position++;
-                       $len = strcspn($this->data, $quote, $this->position);
-                       if ($this->has_data())
-                       {
-                               $value = substr($this->data, $this->position, $len);
-                               $this->position += $len + 1;
-                               return $value;
-                       }
-               }
-               return false;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_STANDALONE_EQUALS = 'standalone_equals';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function before_version_name()
-       {
-               if ($this->skip_whitespace())
-               {
-                       $this->state = 'version_name';
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_STANDALONE_VALUE = 'standalone_value';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function version_name()
-       {
-               if (substr($this->data, $this->position, 7) === 'version')
-               {
-                       $this->position += 7;
-                       $this->skip_whitespace();
-                       $this->state = 'version_equals';
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    private const STATE_ERROR = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function version_equals()
-       {
-               if (substr($this->data, $this->position, 1) === '=')
-               {
-                       $this->position++;
-                       $this->skip_whitespace();
-                       $this->state = 'version_value';
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Current state of the state machine
+     *
+     * @access private
+     * @var self::STATE_*
+     */
+    public $state = self::STATE_BEFORE_VERSION_NAME;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function version_value()
-       {
-               if ($this->version = $this->get_value())
-               {
-                       $this->skip_whitespace();
-                       if ($this->has_data())
-                       {
-                               $this->state = 'encoding_name';
-                       }
-                       else
-                       {
-                               $this->state = 'emit';
-                       }
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Input data
+     *
+     * @access private
+     * @var string
+     */
+    public $data = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function encoding_name()
-       {
-               if (substr($this->data, $this->position, 8) === 'encoding')
-               {
-                       $this->position += 8;
-                       $this->skip_whitespace();
-                       $this->state = 'encoding_equals';
-               }
-               else
-               {
-                       $this->state = 'standalone_name';
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Input data length (to avoid calling strlen() everytime this is needed)
+     *
+     * @access private
+     * @var int
+     */
+    public $data_length = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function encoding_equals()
-       {
-               if (substr($this->data, $this->position, 1) === '=')
-               {
-                       $this->position++;
-                       $this->skip_whitespace();
-                       $this->state = 'encoding_value';
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Current position of the pointer
+     *
+     * @var int
+     * @access private
+     */
+    public $position = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function encoding_value()
-       {
-               if ($this->encoding = $this->get_value())
-               {
-                       $this->skip_whitespace();
-                       if ($this->has_data())
-                       {
-                               $this->state = 'standalone_name';
-                       }
-                       else
-                       {
-                               $this->state = 'emit';
-                       }
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Create an instance of the class with the input data
+     *
+     * @access public
+     * @param string $data Input data
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+        $this->data_length = strlen($this->data);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function standalone_name()
-       {
-               if (substr($this->data, $this->position, 10) === 'standalone')
-               {
-                       $this->position += 10;
-                       $this->skip_whitespace();
-                       $this->state = 'standalone_equals';
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Parse the input data
+     *
+     * @access public
+     * @return bool true on success, false on failure
+     */
+    public function parse()
+    {
+        while ($this->state && $this->state !== self::STATE_EMIT && $this->has_data()) {
+            $state = $this->state;
+            $this->$state();
+        }
+        $this->data = '';
+        if ($this->state === self::STATE_EMIT) {
+            return true;
+        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function standalone_equals()
-       {
-               if (substr($this->data, $this->position, 1) === '=')
-               {
-                       $this->position++;
-                       $this->skip_whitespace();
-                       $this->state = 'standalone_value';
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $this->version = '';
+        $this->encoding = '';
+        $this->standalone = '';
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function standalone_value()
-       {
-               if ($standalone = $this->get_value())
-               {
-                       switch ($standalone)
-                       {
-                               case 'yes':
-                                       $this->standalone = true;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Check whether there is data beyond the pointer
+     *
+     * @access private
+     * @return bool true if there is further data, false if not
+     */
+    public function has_data()
+    {
+        return (bool) ($this->position < $this->data_length);
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case 'no':
-                                       $this->standalone = false;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Advance past any whitespace
+     *
+     * @return int Number of whitespace characters passed
+     */
+    public function skip_whitespace()
+    {
+        $whitespace = strspn($this->data, "\x09\x0A\x0D\x20", $this->position);
+        $this->position += $whitespace;
+        return $whitespace;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                default:
-                                       $this->state = false;
-                                       return;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    /**
+     * Read value
+     */
+    public function get_value()
+    {
+        $quote = substr($this->data, $this->position, 1);
+        if ($quote === '"' || $quote === "'") {
+            $this->position++;
+            $len = strcspn($this->data, $quote, $this->position);
+            if ($this->has_data()) {
+                $value = substr($this->data, $this->position, $len);
+                $this->position += $len + 1;
+                return $value;
+            }
+        }
+        return false;
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->skip_whitespace();
-                       if ($this->has_data())
-                       {
-                               $this->state = false;
-                       }
-                       else
-                       {
-                               $this->state = 'emit';
-                       }
-               }
-               else
-               {
-                       $this->state = false;
-               }
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+    public function before_version_name()
+    {
+        if ($this->skip_whitespace()) {
+            $this->state = self::STATE_VERSION_NAME;
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
+
+    public function version_name()
+    {
+        if (substr($this->data, $this->position, 7) === 'version') {
+            $this->position += 7;
+            $this->skip_whitespace();
+            $this->state = self::STATE_VERSION_EQUALS;
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
+
+    public function version_equals()
+    {
+        if (substr($this->data, $this->position, 1) === '=') {
+            $this->position++;
+            $this->skip_whitespace();
+            $this->state = self::STATE_VERSION_VALUE;
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
+
+    public function version_value()
+    {
+        if ($this->version = $this->get_value()) {
+            $this->skip_whitespace();
+            if ($this->has_data()) {
+                $this->state = self::STATE_ENCODING_NAME;
+            } else {
+                $this->state = self::STATE_EMIT;
+            }
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
+
+    public function encoding_name()
+    {
+        if (substr($this->data, $this->position, 8) === 'encoding') {
+            $this->position += 8;
+            $this->skip_whitespace();
+            $this->state = self::STATE_ENCODING_EQUALS;
+        } else {
+            $this->state = self::STATE_STANDALONE_NAME;
+        }
+    }
+
+    public function encoding_equals()
+    {
+        if (substr($this->data, $this->position, 1) === '=') {
+            $this->position++;
+            $this->skip_whitespace();
+            $this->state = self::STATE_ENCODING_VALUE;
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
+
+    public function encoding_value()
+    {
+        if ($this->encoding = $this->get_value()) {
+            $this->skip_whitespace();
+            if ($this->has_data()) {
+                $this->state = self::STATE_STANDALONE_NAME;
+            } else {
+                $this->state = self::STATE_EMIT;
+            }
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
+
+    public function standalone_name()
+    {
+        if (substr($this->data, $this->position, 10) === 'standalone') {
+            $this->position += 10;
+            $this->skip_whitespace();
+            $this->state = self::STATE_STANDALONE_EQUALS;
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
+
+    public function standalone_equals()
+    {
+        if (substr($this->data, $this->position, 1) === '=') {
+            $this->position++;
+            $this->skip_whitespace();
+            $this->state = self::STATE_STANDALONE_VALUE;
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
+
+    public function standalone_value()
+    {
+        if ($standalone = $this->get_value()) {
+            switch ($standalone) {
+                case 'yes':
+                    $this->standalone = true;
+                    break;
+
+                case 'no':
+                    $this->standalone = false;
+                    break;
+
+                default:
+                    $this->state = self::STATE_ERROR;
+                    return;
+            }
+
+            $this->skip_whitespace();
+            if ($this->has_data()) {
+                $this->state = self::STATE_ERROR;
+            } else {
+                $this->state = self::STATE_EMIT;
+            }
+        } else {
+            $this->state = self::STATE_ERROR;
+        }
+    }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+class_alias('SimplePie\XML\Declaration\Parser', 'SimplePie_XML_Declaration_Parser');
</ins></span></pre></div>
<a id="trunksrcwpincludesSimplePiesrcgzdecodephpfromrev59140trunksrcwpincludesSimplePiegzdecodephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/SimplePie/src/gzdecode.php (from rev 59140, trunk/src/wp-includes/SimplePie/gzdecode.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/SimplePie/src/gzdecode.php                          (rev 0)
+++ trunk/src/wp-includes/SimplePie/src/gzdecode.php    2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,346 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ *       to endorse or promote products derived from this software without specific prior
+ *       written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+/**
+ * Decode 'gzip' encoded HTTP data
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @link http://www.gzip.org/format.txt
+ */
+class Gzdecode
+{
+    /**
+     * Compressed data
+     *
+     * @access private
+     * @var string
+     * @see gzdecode::$data
+     */
+    public $compressed_data;
+
+    /**
+     * Size of compressed data
+     *
+     * @access private
+     * @var int
+     */
+    public $compressed_size;
+
+    /**
+     * Minimum size of a valid gzip string
+     *
+     * @access private
+     * @var int
+     */
+    public $min_compressed_size = 18;
+
+    /**
+     * Current position of pointer
+     *
+     * @access private
+     * @var int
+     */
+    public $position = 0;
+
+    /**
+     * Flags (FLG)
+     *
+     * @access private
+     * @var int
+     */
+    public $flags;
+
+    /**
+     * Uncompressed data
+     *
+     * @access public
+     * @see gzdecode::$compressed_data
+     * @var string
+     */
+    public $data;
+
+    /**
+     * Modified time
+     *
+     * @access public
+     * @var int
+     */
+    public $MTIME;
+
+    /**
+     * Extra Flags
+     *
+     * @access public
+     * @var int
+     */
+    public $XFL;
+
+    /**
+     * Operating System
+     *
+     * @access public
+     * @var int
+     */
+    public $OS;
+
+    /**
+     * Subfield ID 1
+     *
+     * @access public
+     * @see gzdecode::$extra_field
+     * @see gzdecode::$SI2
+     * @var string
+     */
+    public $SI1;
+
+    /**
+     * Subfield ID 2
+     *
+     * @access public
+     * @see gzdecode::$extra_field
+     * @see gzdecode::$SI1
+     * @var string
+     */
+    public $SI2;
+
+    /**
+     * Extra field content
+     *
+     * @access public
+     * @see gzdecode::$SI1
+     * @see gzdecode::$SI2
+     * @var string
+     */
+    public $extra_field;
+
+    /**
+     * Original filename
+     *
+     * @access public
+     * @var string
+     */
+    public $filename;
+
+    /**
+     * Human readable comment
+     *
+     * @access public
+     * @var string
+     */
+    public $comment;
+
+    /**
+     * Don't allow anything to be set
+     *
+     * @param string $name
+     * @param mixed $value
+     */
+    public function __set($name, $value)
+    {
+        throw new Exception("Cannot write property $name");
+    }
+
+    /**
+     * Set the compressed string and related properties
+     *
+     * @param string $data
+     */
+    public function __construct($data)
+    {
+        $this->compressed_data = $data;
+        $this->compressed_size = strlen($data);
+    }
+
+    /**
+     * Decode the GZIP stream
+     *
+     * @return bool Successfulness
+     */
+    public function parse()
+    {
+        if ($this->compressed_size >= $this->min_compressed_size) {
+            $len = 0;
+
+            // Check ID1, ID2, and CM
+            if (substr($this->compressed_data, 0, 3) !== "\x1F\x8B\x08") {
+                return false;
+            }
+
+            // Get the FLG (FLaGs)
+            $this->flags = ord($this->compressed_data[3]);
+
+            // FLG bits above (1 << 4) are reserved
+            if ($this->flags > 0x1F) {
+                return false;
+            }
+
+            // Advance the pointer after the above
+            $this->position += 4;
+
+            // MTIME
+            $mtime = substr($this->compressed_data, $this->position, 4);
+            // Reverse the string if we're on a big-endian arch because l is the only signed long and is machine endianness
+            if (current(unpack('S', "\x00\x01")) === 1) {
+                $mtime = strrev($mtime);
+            }
+            $this->MTIME = current(unpack('l', $mtime));
+            $this->position += 4;
+
+            // Get the XFL (eXtra FLags)
+            $this->XFL = ord($this->compressed_data[$this->position++]);
+
+            // Get the OS (Operating System)
+            $this->OS = ord($this->compressed_data[$this->position++]);
+
+            // Parse the FEXTRA
+            if ($this->flags & 4) {
+                // Read subfield IDs
+                $this->SI1 = $this->compressed_data[$this->position++];
+                $this->SI2 = $this->compressed_data[$this->position++];
+
+                // SI2 set to zero is reserved for future use
+                if ($this->SI2 === "\x00") {
+                    return false;
+                }
+
+                // Get the length of the extra field
+                $len = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
+                $this->position += 2;
+
+                // Check the length of the string is still valid
+                $this->min_compressed_size += $len + 4;
+                if ($this->compressed_size >= $this->min_compressed_size) {
+                    // Set the extra field to the given data
+                    $this->extra_field = substr($this->compressed_data, $this->position, $len);
+                    $this->position += $len;
+                } else {
+                    return false;
+                }
+            }
+
+            // Parse the FNAME
+            if ($this->flags & 8) {
+                // Get the length of the filename
+                $len = strcspn($this->compressed_data, "\x00", $this->position);
+
+                // Check the length of the string is still valid
+                $this->min_compressed_size += $len + 1;
+                if ($this->compressed_size >= $this->min_compressed_size) {
+                    // Set the original filename to the given string
+                    $this->filename = substr($this->compressed_data, $this->position, $len);
+                    $this->position += $len + 1;
+                } else {
+                    return false;
+                }
+            }
+
+            // Parse the FCOMMENT
+            if ($this->flags & 16) {
+                // Get the length of the comment
+                $len = strcspn($this->compressed_data, "\x00", $this->position);
+
+                // Check the length of the string is still valid
+                $this->min_compressed_size += $len + 1;
+                if ($this->compressed_size >= $this->min_compressed_size) {
+                    // Set the original comment to the given string
+                    $this->comment = substr($this->compressed_data, $this->position, $len);
+                    $this->position += $len + 1;
+                } else {
+                    return false;
+                }
+            }
+
+            // Parse the FHCRC
+            if ($this->flags & 2) {
+                // Check the length of the string is still valid
+                $this->min_compressed_size += $len + 2;
+                if ($this->compressed_size >= $this->min_compressed_size) {
+                    // Read the CRC
+                    $crc = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
+
+                    // Check the CRC matches
+                    if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc) {
+                        $this->position += 2;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+            }
+
+            // Decompress the actual data
+            if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false) {
+                return false;
+            }
+
+            $this->position = $this->compressed_size - 8;
+
+            // Check CRC of data
+            $crc = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
+            $this->position += 4;
+            /*if (extension_loaded('hash') && sprintf('%u', current(unpack('V', hash('crc32b', $this->data)))) !== sprintf('%u', $crc))
+            {
+                return false;
+            }*/
+
+            // Check ISIZE of data
+            $isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
+            $this->position += 4;
+            if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize)) {
+                return false;
+            }
+
+            // Wow, against all odds, we've actually got a valid gzip string
+            return true;
+        }
+
+        return false;
+    }
+}
+
+class_alias('SimplePie\Gzdecode', 'SimplePie_gzdecode');
</ins></span></pre></div>
<a id="trunksrcwpincludesclassfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-feed.php      2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/class-feed.php        2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_file( basename( __FILE__ ), '4.7.0', 'fetch_feed()' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! class_exists( 'SimplePie', false ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! class_exists( 'SimplePie\SimplePie', false ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">         require_once ABSPATH . WPINC . '/class-simplepie.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesclasssimplepiephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-simplepie.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-simplepie.php 2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/class-simplepie.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3355 +1,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! class_exists( 'SimplePie', false ) ) :
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Load classes we will need.
-require ABSPATH . WPINC . '/SimplePie/Misc.php';
-require ABSPATH . WPINC . '/SimplePie/Cache.php';
-require ABSPATH . WPINC . '/SimplePie/File.php';
-require ABSPATH . WPINC . '/SimplePie/Sanitize.php';
-require ABSPATH . WPINC . '/SimplePie/Registry.php';
-require ABSPATH . WPINC . '/SimplePie/IRI.php';
-require ABSPATH . WPINC . '/SimplePie/Locator.php';
-require ABSPATH . WPINC . '/SimplePie/Content/Type/Sniffer.php';
-require ABSPATH . WPINC . '/SimplePie/XML/Declaration/Parser.php';
-require ABSPATH . WPINC . '/SimplePie/Parser.php';
-require ABSPATH . WPINC . '/SimplePie/Item.php';
-require ABSPATH . WPINC . '/SimplePie/Parse/Date.php';
-require ABSPATH . WPINC . '/SimplePie/Author.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( class_exists( 'SimplePie', false ) ) {
+       return;
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Load and register the SimplePie native autoloaders.
+require ABSPATH . WPINC . '/SimplePie/autoloader.php';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * WordPress autoloader for SimplePie.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 6.7.0 Use `SimplePie_Autoloader` instead.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @param string $class Class name.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_simplepie_autoload( $class ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( ! str_starts_with( $class, 'SimplePie_' ) )
-               return;
-
-       $file = ABSPATH . WPINC . '/' . str_replace( '_', '/', $class ) . '.php';
-       include $file;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_function( __FUNCTION__, '6.7.0', 'SimplePie_Autoloader' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/**
- * We autoload classes we may not need.
- */
-spl_autoload_register( 'wp_simplepie_autoload' );
-
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2017, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- *     * Neither the name of the SimplePie Team nor the names of its contributors may be used
- *       to endorse or promote products derived from this software without specific prior
- *       written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version 1.5.8
- * @copyright 2004-2017 Ryan Parman, Sam Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Sam Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
-
-/**
- * SimplePie Name
- */
-define('SIMPLEPIE_NAME', 'SimplePie');
-
-/**
- * SimplePie Version
- */
-define('SIMPLEPIE_VERSION', '1.5.8');
-
-/**
- * SimplePie Build
- * @todo Hardcode for release (there's no need to have to call SimplePie_Misc::get_build() only every load of simplepie.inc)
- */
-define('SIMPLEPIE_BUILD', gmdate('YmdHis', SimplePie_Misc::get_build()));
-
-/**
- * SimplePie Website URL
- */
-define('SIMPLEPIE_URL', 'http://simplepie.org');
-
-/**
- * SimplePie Useragent
- * @see SimplePie::set_useragent()
- */
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
-
-/**
- * SimplePie Linkback
- */
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
-
-/**
- * No Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_NONE', 0);
-
-/**
- * Feed Link Element Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1);
-
-/**
- * Local Feed Extension Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2);
-
-/**
- * Local Feed Body Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_LOCAL_BODY', 4);
-
-/**
- * Remote Feed Extension Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_REMOTE_EXTENSION', 8);
-
-/**
- * Remote Feed Body Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_REMOTE_BODY', 16);
-
-/**
- * All Feed Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_ALL', 31);
-
-/**
- * No known feed type
- */
-define('SIMPLEPIE_TYPE_NONE', 0);
-
-/**
- * RSS 0.90
- */
-define('SIMPLEPIE_TYPE_RSS_090', 1);
-
-/**
- * RSS 0.91 (Netscape)
- */
-define('SIMPLEPIE_TYPE_RSS_091_NETSCAPE', 2);
-
-/**
- * RSS 0.91 (Userland)
- */
-define('SIMPLEPIE_TYPE_RSS_091_USERLAND', 4);
-
-/**
- * RSS 0.91 (both Netscape and Userland)
- */
-define('SIMPLEPIE_TYPE_RSS_091', 6);
-
-/**
- * RSS 0.92
- */
-define('SIMPLEPIE_TYPE_RSS_092', 8);
-
-/**
- * RSS 0.93
- */
-define('SIMPLEPIE_TYPE_RSS_093', 16);
-
-/**
- * RSS 0.94
- */
-define('SIMPLEPIE_TYPE_RSS_094', 32);
-
-/**
- * RSS 1.0
- */
-define('SIMPLEPIE_TYPE_RSS_10', 64);
-
-/**
- * RSS 2.0
- */
-define('SIMPLEPIE_TYPE_RSS_20', 128);
-
-/**
- * RDF-based RSS
- */
-define('SIMPLEPIE_TYPE_RSS_RDF', 65);
-
-/**
- * Non-RDF-based RSS (truly intended as syndication format)
- */
-define('SIMPLEPIE_TYPE_RSS_SYNDICATION', 190);
-
-/**
- * All RSS
- */
-define('SIMPLEPIE_TYPE_RSS_ALL', 255);
-
-/**
- * Atom 0.3
- */
-define('SIMPLEPIE_TYPE_ATOM_03', 256);
-
-/**
- * Atom 1.0
- */
-define('SIMPLEPIE_TYPE_ATOM_10', 512);
-
-/**
- * All Atom
- */
-define('SIMPLEPIE_TYPE_ATOM_ALL', 768);
-
-/**
- * All feed types
- */
-define('SIMPLEPIE_TYPE_ALL', 1023);
-
-/**
- * No construct
- */
-define('SIMPLEPIE_CONSTRUCT_NONE', 0);
-
-/**
- * Text construct
- */
-define('SIMPLEPIE_CONSTRUCT_TEXT', 1);
-
-/**
- * HTML construct
- */
-define('SIMPLEPIE_CONSTRUCT_HTML', 2);
-
-/**
- * XHTML construct
- */
-define('SIMPLEPIE_CONSTRUCT_XHTML', 4);
-
-/**
- * base64-encoded construct
- */
-define('SIMPLEPIE_CONSTRUCT_BASE64', 8);
-
-/**
- * IRI construct
- */
-define('SIMPLEPIE_CONSTRUCT_IRI', 16);
-
-/**
- * A construct that might be HTML
- */
-define('SIMPLEPIE_CONSTRUCT_MAYBE_HTML', 32);
-
-/**
- * All constructs
- */
-define('SIMPLEPIE_CONSTRUCT_ALL', 63);
-
-/**
- * Don't change case
- */
-define('SIMPLEPIE_SAME_CASE', 1);
-
-/**
- * Change to lowercase
- */
-define('SIMPLEPIE_LOWERCASE', 2);
-
-/**
- * Change to uppercase
- */
-define('SIMPLEPIE_UPPERCASE', 4);
-
-/**
- * PCRE for HTML attributes
- */
-define('SIMPLEPIE_PCRE_HTML_ATTRIBUTE', '((?:[\x09\x0A\x0B\x0C\x0D\x20]+[^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"(?:[^"]*)"|\'(?:[^\']*)\'|(?:[^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?)*)[\x09\x0A\x0B\x0C\x0D\x20]*');
-
-/**
- * PCRE for XML attributes
- */
-define('SIMPLEPIE_PCRE_XML_ATTRIBUTE', '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'))*)\s*');
-
-/**
- * XML Namespace
- */
-define('SIMPLEPIE_NAMESPACE_XML', 'http://www.w3.org/XML/1998/namespace');
-
-/**
- * Atom 1.0 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_ATOM_10', 'http://www.w3.org/2005/Atom');
-
-/**
- * Atom 0.3 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_ATOM_03', 'http://purl.org/atom/ns#');
-
-/**
- * RDF Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RDF', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
-
-/**
- * RSS 0.90 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RSS_090', 'http://my.netscape.com/rdf/simple/0.9/');
-
-/**
- * RSS 1.0 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RSS_10', 'http://purl.org/rss/1.0/');
-
-/**
- * RSS 1.0 Content Module Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT', 'http://purl.org/rss/1.0/modules/content/');
-
-/**
- * RSS 2.0 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RSS_20', '');
-
-/**
- * DC 1.0 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_DC_10', 'http://purl.org/dc/elements/1.0/');
-
-/**
- * DC 1.1 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_DC_11', 'http://purl.org/dc/elements/1.1/');
-
-/**
- * W3C Basic Geo (WGS84 lat/long) Vocabulary Namespace
- */
-define('SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO', 'http://www.w3.org/2003/01/geo/wgs84_pos#');
-
-/**
- * GeoRSS Namespace
- */
-define('SIMPLEPIE_NAMESPACE_GEORSS', 'http://www.georss.org/georss');
-
-/**
- * Media RSS Namespace
- */
-define('SIMPLEPIE_NAMESPACE_MEDIARSS', 'http://search.yahoo.com/mrss/');
-
-/**
- * Wrong Media RSS Namespace. Caused by a long-standing typo in the spec.
- */
-define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG', 'http://search.yahoo.com/mrss');
-
-/**
- * Wrong Media RSS Namespace #2. New namespace introduced in Media RSS 1.5.
- */
-define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2', 'http://video.search.yahoo.com/mrss');
-
-/**
- * Wrong Media RSS Namespace #3. A possible typo of the Media RSS 1.5 namespace.
- */
-define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3', 'http://video.search.yahoo.com/mrss/');
-
-/**
- * Wrong Media RSS Namespace #4. New spec location after the RSS Advisory Board takes it over, but not a valid namespace.
- */
-define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4', 'http://www.rssboard.org/media-rss');
-
-/**
- * Wrong Media RSS Namespace #5. A possible typo of the RSS Advisory Board URL.
- */
-define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5', 'http://www.rssboard.org/media-rss/');
-
-/**
- * iTunes RSS Namespace
- */
-define('SIMPLEPIE_NAMESPACE_ITUNES', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
-
-/**
- * XHTML Namespace
- */
-define('SIMPLEPIE_NAMESPACE_XHTML', 'http://www.w3.org/1999/xhtml');
-
-/**
- * IANA Link Relations Registry
- */
-define('SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY', 'http://www.iana.org/assignments/relation/');
-
-/**
- * No file source
- */
-define('SIMPLEPIE_FILE_SOURCE_NONE', 0);
-
-/**
- * Remote file source
- */
-define('SIMPLEPIE_FILE_SOURCE_REMOTE', 1);
-
-/**
- * Local file source
- */
-define('SIMPLEPIE_FILE_SOURCE_LOCAL', 2);
-
-/**
- * fsockopen() file source
- */
-define('SIMPLEPIE_FILE_SOURCE_FSOCKOPEN', 4);
-
-/**
- * cURL file source
- */
-define('SIMPLEPIE_FILE_SOURCE_CURL', 8);
-
-/**
- * file_get_contents() file source
- */
-define('SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS', 16);
-
-
-
-/**
- * SimplePie
- *
- * @package SimplePie
- * @subpackage API
- */
-class SimplePie
-{
-       /**
-        * @var array Raw data
-        * @access private
-        */
-       public $data = array();
-
-       /**
-        * @var mixed Error string
-        * @access private
-        */
-       public $error;
-
-       /**
-        * @var int HTTP status code
-        * @see SimplePie::status_code()
-        * @access private
-        */
-       public $status_code;
-
-       /**
-        * @var object Instance of SimplePie_Sanitize (or other class)
-        * @see SimplePie::set_sanitize_class()
-        * @access private
-        */
-       public $sanitize;
-
-       /**
-        * @var string SimplePie Useragent
-        * @see SimplePie::set_useragent()
-        * @access private
-        */
-       public $useragent = SIMPLEPIE_USERAGENT;
-
-       /**
-        * @var string Feed URL
-        * @see SimplePie::set_feed_url()
-        * @access private
-        */
-       public $feed_url;
-
-       /**
-        * @var string Original feed URL, or new feed URL iff HTTP 301 Moved Permanently
-        * @see SimplePie::subscribe_url()
-        * @access private
-        */
-       public $permanent_url = null;
-
-       /**
-        * @var object Instance of SimplePie_File to use as a feed
-        * @see SimplePie::set_file()
-        * @access private
-        */
-       public $file;
-
-       /**
-        * @var string Raw feed data
-        * @see SimplePie::set_raw_data()
-        * @access private
-        */
-       public $raw_data;
-
-       /**
-        * @var int Timeout for fetching remote files
-        * @see SimplePie::set_timeout()
-        * @access private
-        */
-       public $timeout = 10;
-
-       /**
-        * @var array Custom curl options
-        * @see SimplePie::set_curl_options()
-        * @access private
-        */
-       public $curl_options = array();
-
-       /**
-        * @var bool Forces fsockopen() to be used for remote files instead
-        * of cURL, even if a new enough version is installed
-        * @see SimplePie::force_fsockopen()
-        * @access private
-        */
-       public $force_fsockopen = false;
-
-       /**
-        * @var bool Force the given data/URL to be treated as a feed no matter what
-        * it appears like
-        * @see SimplePie::force_feed()
-        * @access private
-        */
-       public $force_feed = false;
-
-       /**
-        * @var bool Enable/Disable Caching
-        * @see SimplePie::enable_cache()
-        * @access private
-        */
-       public $cache = true;
-
-       /**
-        * @var bool Force SimplePie to fallback to expired cache, if enabled,
-        * when feed is unavailable.
-        * @see SimplePie::force_cache_fallback()
-        * @access private
-        */
-       public $force_cache_fallback = false;
-
-       /**
-        * @var int Cache duration (in seconds)
-        * @see SimplePie::set_cache_duration()
-        * @access private
-        */
-       public $cache_duration = 3600;
-
-       /**
-        * @var int Auto-discovery cache duration (in seconds)
-        * @see SimplePie::set_autodiscovery_cache_duration()
-        * @access private
-        */
-       public $autodiscovery_cache_duration = 604800; // 7 Days.
-
-       /**
-        * @var string Cache location (relative to executing script)
-        * @see SimplePie::set_cache_location()
-        * @access private
-        */
-       public $cache_location = './cache';
-
-       /**
-        * @var string Function that creates the cache filename
-        * @see SimplePie::set_cache_name_function()
-        * @access private
-        */
-       public $cache_name_function = 'md5';
-
-       /**
-        * @var bool Reorder feed by date descending
-        * @see SimplePie::enable_order_by_date()
-        * @access private
-        */
-       public $order_by_date = true;
-
-       /**
-        * @var mixed Force input encoding to be set to the follow value
-        * (false, or anything type-cast to false, disables this feature)
-        * @see SimplePie::set_input_encoding()
-        * @access private
-        */
-       public $input_encoding = false;
-
-       /**
-        * @var int Feed Autodiscovery Level
-        * @see SimplePie::set_autodiscovery_level()
-        * @access private
-        */
-       public $autodiscovery = SIMPLEPIE_LOCATOR_ALL;
-
-       /**
-        * Class registry object
-        *
-        * @var SimplePie_Registry
-        */
-       public $registry;
-
-       /**
-        * @var int Maximum number of feeds to check with autodiscovery
-        * @see SimplePie::set_max_checked_feeds()
-        * @access private
-        */
-       public $max_checked_feeds = 10;
-
-       /**
-        * @var array All the feeds found during the autodiscovery process
-        * @see SimplePie::get_all_discovered_feeds()
-        * @access private
-        */
-       public $all_discovered_feeds = array();
-
-       /**
-        * @var string Web-accessible path to the handler_image.php file.
-        * @see SimplePie::set_image_handler()
-        * @access private
-        */
-       public $image_handler = '';
-
-       /**
-        * @var array Stores the URLs when multiple feeds are being initialized.
-        * @see SimplePie::set_feed_url()
-        * @access private
-        */
-       public $multifeed_url = array();
-
-       /**
-        * @var array Stores SimplePie objects when multiple feeds initialized.
-        * @access private
-        */
-       public $multifeed_objects = array();
-
-       /**
-        * @var array Stores the get_object_vars() array for use with multifeeds.
-        * @see SimplePie::set_feed_url()
-        * @access private
-        */
-       public $config_settings = null;
-
-       /**
-        * @var integer Stores the number of items to return per-feed with multifeeds.
-        * @see SimplePie::set_item_limit()
-        * @access private
-        */
-       public $item_limit = 0;
-
-       /**
-        * @var bool Stores if last-modified and/or etag headers were sent with the
-        * request when checking a feed.
-        */
-       public $check_modified = false;
-
-       /**
-        * @var array Stores the default attributes to be stripped by strip_attributes().
-        * @see SimplePie::strip_attributes()
-        * @access private
-        */
-       public $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
-
-       /**
-        * @var array Stores the default attributes to add to different tags by add_attributes().
-        * @see SimplePie::add_attributes()
-        * @access private
-        */
-       public $add_attributes = array('audio' => array('preload' => 'none'), 'iframe' => array('sandbox' => 'allow-scripts allow-same-origin'), 'video' => array('preload' => 'none'));
-
-       /**
-        * @var array Stores the default tags to be stripped by strip_htmltags().
-        * @see SimplePie::strip_htmltags()
-        * @access private
-        */
-       public $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
-
-       /**
-        * @var bool Should we throw exceptions, or use the old-style error property?
-        * @access private
-        */
-       public $enable_exceptions = false;
-
-       /**
-        * The SimplePie class contains feed level data and options
-        *
-        * To use SimplePie, create the SimplePie object with no parameters. You can
-        * then set configuration options using the provided methods. After setting
-        * them, you must initialise the feed using $feed->init(). At that point the
-        * object's methods and properties will be available to you.
-        *
-        * Previously, it was possible to pass in the feed URL along with cache
-        * options directly into the constructor. This has been removed as of 1.3 as
-        * it caused a lot of confusion.
-        *
-        * @since 1.0 Preview Release
-        */
-       public function __construct()
-       {
-               if (version_compare(PHP_VERSION, '5.6', '<'))
-               {
-                       trigger_error('Please upgrade to PHP 5.6 or newer.');
-                       die();
-               }
-
-               // Other objects, instances created here so we can set options on them
-               $this->sanitize = new SimplePie_Sanitize();
-               $this->registry = new SimplePie_Registry();
-
-               if (func_num_args() > 0)
-               {
-                       $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
-                       trigger_error('Passing parameters to the constructor is no longer supported. Please use set_feed_url(), set_cache_location(), and set_cache_duration() directly.', $level);
-
-                       $args = func_get_args();
-                       switch (count($args)) {
-                               case 3:
-                                       $this->set_cache_duration($args[2]);
-                               case 2:
-                                       $this->set_cache_location($args[1]);
-                               case 1:
-                                       $this->set_feed_url($args[0]);
-                                       $this->init();
-                       }
-               }
-       }
-
-       /**
-        * Used for converting object to a string
-        */
-       public function __toString()
-       {
-               return md5(serialize($this->data));
-       }
-
-       /**
-        * Remove items that link back to this before destroying this object
-        */
-       public function __destruct()
-       {
-               if (!gc_enabled())
-               {
-                       if (!empty($this->data['items']))
-                       {
-                               foreach ($this->data['items'] as $item)
-                               {
-                                       $item->__destruct();
-                               }
-                               unset($item, $this->data['items']);
-                       }
-                       if (!empty($this->data['ordered_items']))
-                       {
-                               foreach ($this->data['ordered_items'] as $item)
-                               {
-                                       $item->__destruct();
-                               }
-                               unset($item, $this->data['ordered_items']);
-                       }
-               }
-       }
-
-       /**
-        * Force the given data/URL to be treated as a feed
-        *
-        * This tells SimplePie to ignore the content-type provided by the server.
-        * Be careful when using this option, as it will also disable autodiscovery.
-        *
-        * @since 1.1
-        * @param bool $enable Force the given data/URL to be treated as a feed
-        */
-       public function force_feed($enable = false)
-       {
-               $this->force_feed = (bool) $enable;
-       }
-
-       /**
-        * Set the URL of the feed you want to parse
-        *
-        * This allows you to enter the URL of the feed you want to parse, or the
-        * website you want to try to use auto-discovery on. This takes priority
-        * over any set raw data.
-        *
-        * You can set multiple feeds to mash together by passing an array instead
-        * of a string for the $url. Remember that with each additional feed comes
-        * additional processing and resources.
-        *
-        * @since 1.0 Preview Release
-        * @see set_raw_data()
-        * @param string|array $url This is the URL (or array of URLs) that you want to parse.
-        */
-       public function set_feed_url($url)
-       {
-               $this->multifeed_url = array();
-               if (is_array($url))
-               {
-                       foreach ($url as $value)
-                       {
-                               $this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1));
-                       }
-               }
-               else
-               {
-                       $this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
-                       $this->permanent_url = $this->feed_url;
-               }
-       }
-
-       /**
-        * Set an instance of {@see SimplePie_File} to use as a feed
-        *
-        * @param SimplePie_File &$file
-        * @return bool True on success, false on failure
-        */
-       public function set_file(&$file)
-       {
-               if ($file instanceof SimplePie_File)
-               {
-                       $this->feed_url = $file->url;
-                       $this->permanent_url = $this->feed_url;
-                       $this->file =& $file;
-                       return true;
-               }
-               return false;
-       }
-
-       /**
-        * Set the raw XML data to parse
-        *
-        * Allows you to use a string of RSS/Atom data instead of a remote feed.
-        *
-        * If you have a feed available as a string in PHP, you can tell SimplePie
-        * to parse that data string instead of a remote feed. Any set feed URL
-        * takes precedence.
-        *
-        * @since 1.0 Beta 3
-        * @param string $data RSS or Atom data as a string.
-        * @see set_feed_url()
-        */
-       public function set_raw_data($data)
-       {
-               $this->raw_data = $data;
-       }
-
-       /**
-        * Set the default timeout for fetching remote feeds
-        *
-        * This allows you to change the maximum time the feed's server to respond
-        * and send the feed back.
-        *
-        * @since 1.0 Beta 3
-        * @param int $timeout The maximum number of seconds to spend waiting to retrieve a feed.
-        */
-       public function set_timeout($timeout = 10)
-       {
-               $this->timeout = (int) $timeout;
-       }
-
-       /**
-        * Set custom curl options
-        *
-        * This allows you to change default curl options
-        *
-        * @since 1.0 Beta 3
-        * @param array $curl_options Curl options to add to default settings
-        */
-       public function set_curl_options(array $curl_options = array())
-       {
-               $this->curl_options = $curl_options;
-       }
-
-       /**
-        * Force SimplePie to use fsockopen() instead of cURL
-        *
-        * @since 1.0 Beta 3
-        * @param bool $enable Force fsockopen() to be used
-        */
-       public function force_fsockopen($enable = false)
-       {
-               $this->force_fsockopen = (bool) $enable;
-       }
-
-       /**
-        * Enable/disable caching in SimplePie.
-        *
-        * This option allows you to disable caching all-together in SimplePie.
-        * However, disabling the cache can lead to longer load times.
-        *
-        * @since 1.0 Preview Release
-        * @param bool $enable Enable caching
-        */
-       public function enable_cache($enable = true)
-       {
-               $this->cache = (bool) $enable;
-       }
-
-       /**
-        * SimplePie to continue to fall back to expired cache, if enabled, when
-        * feed is unavailable.
-        *
-        * This tells SimplePie to ignore any file errors and fall back to cache
-        * instead. This only works if caching is enabled and cached content
-        * still exists.
-
-        * @param bool $enable Force use of cache on fail.
-        */
-       public function force_cache_fallback($enable = false)
-       {
-               $this->force_cache_fallback= (bool) $enable;
-       }
-
-       /**
-        * Set the length of time (in seconds) that the contents of a feed will be
-        * cached
-        *
-        * @param int $seconds The feed content cache duration
-        */
-       public function set_cache_duration($seconds = 3600)
-       {
-               $this->cache_duration = (int) $seconds;
-       }
-
-       /**
-        * Set the length of time (in seconds) that the autodiscovered feed URL will
-        * be cached
-        *
-        * @param int $seconds The autodiscovered feed URL cache duration.
-        */
-       public function set_autodiscovery_cache_duration($seconds = 604800)
-       {
-               $this->autodiscovery_cache_duration = (int) $seconds;
-       }
-
-       /**
-        * Set the file system location where the cached files should be stored
-        *
-        * @param string $location The file system location.
-        */
-       public function set_cache_location($location = './cache')
-       {
-               $this->cache_location = (string) $location;
-       }
-
-       /**
-        * Return the filename (i.e. hash, without path and without extension) of the file to cache a given URL.
-        * @param string $url The URL of the feed to be cached.
-        * @return string A filename (i.e. hash, without path and without extension).
-        */
-       public function get_cache_filename($url)
-       {
-               // Append custom parameters to the URL to avoid cache pollution in case of multiple calls with different parameters.
-               $url .= $this->force_feed ? '#force_feed' : '';
-               $options = array();
-               if ($this->timeout != 10)
-               {
-                       $options[CURLOPT_TIMEOUT] = $this->timeout;
-               }
-               if ($this->useragent !== SIMPLEPIE_USERAGENT)
-               {
-                       $options[CURLOPT_USERAGENT] = $this->useragent;
-               }
-               if (!empty($this->curl_options))
-               {
-                       foreach ($this->curl_options as $k => $v)
-                       {
-                               $options[$k] = $v;
-                       }
-               }
-               if (!empty($options))
-               {
-                       ksort($options);
-                       $url .= '#' . urlencode(var_export($options, true));
-               }
-               return call_user_func($this->cache_name_function, $url);
-       }
-
-       /**
-        * Set whether feed items should be sorted into reverse chronological order
-        *
-        * @param bool $enable Sort as reverse chronological order.
-        */
-       public function enable_order_by_date($enable = true)
-       {
-               $this->order_by_date = (bool) $enable;
-       }
-
-       /**
-        * Set the character encoding used to parse the feed
-        *
-        * This overrides the encoding reported by the feed, however it will fall
-        * back to the normal encoding detection if the override fails
-        *
-        * @param string $encoding Character encoding
-        */
-       public function set_input_encoding($encoding = false)
-       {
-               if ($encoding)
-               {
-                       $this->input_encoding = (string) $encoding;
-               }
-               else
-               {
-                       $this->input_encoding = false;
-               }
-       }
-
-       /**
-        * Set how much feed autodiscovery to do
-        *
-        * @see SIMPLEPIE_LOCATOR_NONE
-        * @see SIMPLEPIE_LOCATOR_AUTODISCOVERY
-        * @see SIMPLEPIE_LOCATOR_LOCAL_EXTENSION
-        * @see SIMPLEPIE_LOCATOR_LOCAL_BODY
-        * @see SIMPLEPIE_LOCATOR_REMOTE_EXTENSION
-        * @see SIMPLEPIE_LOCATOR_REMOTE_BODY
-        * @see SIMPLEPIE_LOCATOR_ALL
-        * @param int $level Feed Autodiscovery Level (level can be a combination of the above constants, see bitwise OR operator)
-        */
-       public function set_autodiscovery_level($level = SIMPLEPIE_LOCATOR_ALL)
-       {
-               $this->autodiscovery = (int) $level;
-       }
-
-       /**
-        * Get the class registry
-        *
-        * Use this to override SimplePie's default classes
-        * @see SimplePie_Registry
-        * @return SimplePie_Registry
-        */
-       public function &get_registry()
-       {
-               return $this->registry;
-       }
-
-       /**#@+
-        * Useful when you are overloading or extending SimplePie's default classes.
-        *
-        * @deprecated Use {@see get_registry()} instead
-        * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-        * @param string $class Name of custom class
-        * @return boolean True on success, false otherwise
-        */
-       /**
-        * Set which class SimplePie uses for caching
-        */
-       public function set_cache_class($class = 'SimplePie_Cache')
-       {
-               return $this->registry->register('Cache', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for auto-discovery
-        */
-       public function set_locator_class($class = 'SimplePie_Locator')
-       {
-               return $this->registry->register('Locator', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for XML parsing
-        */
-       public function set_parser_class($class = 'SimplePie_Parser')
-       {
-               return $this->registry->register('Parser', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for remote file fetching
-        */
-       public function set_file_class($class = 'SimplePie_File')
-       {
-               return $this->registry->register('File', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for data sanitization
-        */
-       public function set_sanitize_class($class = 'SimplePie_Sanitize')
-       {
-               return $this->registry->register('Sanitize', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for handling feed items
-        */
-       public function set_item_class($class = 'SimplePie_Item')
-       {
-               return $this->registry->register('Item', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for handling author data
-        */
-       public function set_author_class($class = 'SimplePie_Author')
-       {
-               return $this->registry->register('Author', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for handling category data
-        */
-       public function set_category_class($class = 'SimplePie_Category')
-       {
-               return $this->registry->register('Category', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for feed enclosures
-        */
-       public function set_enclosure_class($class = 'SimplePie_Enclosure')
-       {
-               return $this->registry->register('Enclosure', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for `<media:text>` captions
-        */
-       public function set_caption_class($class = 'SimplePie_Caption')
-       {
-               return $this->registry->register('Caption', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for `<media:copyright>`
-        */
-       public function set_copyright_class($class = 'SimplePie_Copyright')
-       {
-               return $this->registry->register('Copyright', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for `<media:credit>`
-        */
-       public function set_credit_class($class = 'SimplePie_Credit')
-       {
-               return $this->registry->register('Credit', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for `<media:rating>`
-        */
-       public function set_rating_class($class = 'SimplePie_Rating')
-       {
-               return $this->registry->register('Rating', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for `<media:restriction>`
-        */
-       public function set_restriction_class($class = 'SimplePie_Restriction')
-       {
-               return $this->registry->register('Restriction', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses for content-type sniffing
-        */
-       public function set_content_type_sniffer_class($class = 'SimplePie_Content_Type_Sniffer')
-       {
-               return $this->registry->register('Content_Type_Sniffer', $class, true);
-       }
-
-       /**
-        * Set which class SimplePie uses item sources
-        */
-       public function set_source_class($class = 'SimplePie_Source')
-       {
-               return $this->registry->register('Source', $class, true);
-       }
-       /**#@-*/
-
-       /**
-        * Set the user agent string
-        *
-        * @param string $ua New user agent string.
-        */
-       public function set_useragent($ua = SIMPLEPIE_USERAGENT)
-       {
-               $this->useragent = (string) $ua;
-       }
-
-       /**
-        * Set callback function to create cache filename with
-        *
-        * @param mixed $function Callback function
-        */
-       public function set_cache_name_function($function = 'md5')
-       {
-               if (is_callable($function))
-               {
-                       $this->cache_name_function = $function;
-               }
-       }
-
-       /**
-        * Set options to make SimplePie as fast as possible.
-        *
-        * Forgoes a substantial amount of data sanitization in favor of speed.
-        * This turns SimplePie into a less clever parser of feeds.
-        *
-        * @param bool $set Whether to set them or not.
-        */
-       public function set_stupidly_fast($set = false)
-       {
-               if ($set)
-               {
-                       $this->enable_order_by_date(false);
-                       $this->remove_div(false);
-                       $this->strip_comments(false);
-                       $this->strip_htmltags(false);
-                       $this->strip_attributes(false);
-                       $this->add_attributes(false);
-                       $this->set_image_handler(false);
-                       $this->set_https_domains(array());
-               }
-       }
-
-       /**
-        * Set maximum number of feeds to check with autodiscovery
-        *
-        * @param int $max Maximum number of feeds to check
-        */
-       public function set_max_checked_feeds($max = 10)
-       {
-               $this->max_checked_feeds = (int) $max;
-       }
-
-       public function remove_div($enable = true)
-       {
-               $this->sanitize->remove_div($enable);
-       }
-
-       public function strip_htmltags($tags = '', $encode = null)
-       {
-               if ($tags === '')
-               {
-                       $tags = $this->strip_htmltags;
-               }
-               $this->sanitize->strip_htmltags($tags);
-               if ($encode !== null)
-               {
-                       $this->sanitize->encode_instead_of_strip($tags);
-               }
-       }
-
-       public function encode_instead_of_strip($enable = true)
-       {
-               $this->sanitize->encode_instead_of_strip($enable);
-       }
-
-       public function strip_attributes($attribs = '')
-       {
-               if ($attribs === '')
-               {
-                       $attribs = $this->strip_attributes;
-               }
-               $this->sanitize->strip_attributes($attribs);
-       }
-
-       public function add_attributes($attribs = '')
-       {
-               if ($attribs === '')
-               {
-                       $attribs = $this->add_attributes;
-               }
-               $this->sanitize->add_attributes($attribs);
-       }
-
-       /**
-        * Set the output encoding
-        *
-        * Allows you to override SimplePie's output to match that of your webpage.
-        * This is useful for times when your webpages are not being served as
-        * UTF-8. This setting will be obeyed by {@see handle_content_type()}, and
-        * is similar to {@see set_input_encoding()}.
-        *
-        * It should be noted, however, that not all character encodings can support
-        * all characters. If your page is being served as ISO-8859-1 and you try
-        * to display a Japanese feed, you'll likely see garbled characters.
-        * Because of this, it is highly recommended to ensure that your webpages
-        * are served as UTF-8.
-        *
-        * The number of supported character encodings depends on whether your web
-        * host supports {@link http://php.net/mbstring mbstring},
-        * {@link http://php.net/iconv iconv}, or both. See
-        * {@link http://simplepie.org/wiki/faq/Supported_Character_Encodings} for
-        * more information.
-        *
-        * @param string $encoding
-        */
-       public function set_output_encoding($encoding = 'UTF-8')
-       {
-               $this->sanitize->set_output_encoding($encoding);
-       }
-
-       public function strip_comments($strip = false)
-       {
-               $this->sanitize->strip_comments($strip);
-       }
-
-       /**
-        * Set element/attribute key/value pairs of HTML attributes
-        * containing URLs that need to be resolved relative to the feed
-        *
-        * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite,
-        * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite,
-        * |q|@cite
-        *
-        * @since 1.0
-        * @param array|null $element_attribute Element/attribute key/value pairs, null for default
-        */
-       public function set_url_replacements($element_attribute = null)
-       {
-               $this->sanitize->set_url_replacements($element_attribute);
-       }
-
-       /**
-        * Set the list of domains for which to force HTTPS.
-        * @see SimplePie_Sanitize::set_https_domains()
-        * @param array List of HTTPS domains. Example array('biz', 'example.com', 'example.org', 'www.example.net').
-        */
-       public function set_https_domains($domains = array())
-       {
-               if (is_array($domains))
-               {
-                       $this->sanitize->set_https_domains($domains);
-               }
-       }
-
-       /**
-        * Set the handler to enable the display of cached images.
-        *
-        * @param string $page Web-accessible path to the handler_image.php file.
-        * @param string $qs The query string that the value should be passed to.
-        */
-       public function set_image_handler($page = false, $qs = 'i')
-       {
-               if ($page !== false)
-               {
-                       $this->sanitize->set_image_handler($page . '?' . $qs . '=');
-               }
-               else
-               {
-                       $this->image_handler = '';
-               }
-       }
-
-       /**
-        * Set the limit for items returned per-feed with multifeeds
-        *
-        * @param integer $limit The maximum number of items to return.
-        */
-       public function set_item_limit($limit = 0)
-       {
-               $this->item_limit = (int) $limit;
-       }
-
-       /**
-        * Enable throwing exceptions
-        *
-        * @param boolean $enable Should we throw exceptions, or use the old-style error property?
-        */
-       public function enable_exceptions($enable = true)
-       {
-               $this->enable_exceptions = $enable;
-       }
-
-       /**
-        * Initialize the feed object
-        *
-        * This is what makes everything happen. Period. This is where all of the
-        * configuration options get processed, feeds are fetched, cached, and
-        * parsed, and all of that other good stuff.
-        *
-        * @return boolean True if successful, false otherwise
-        */
-       public function init()
-       {
-               // Check absolute bare minimum requirements.
-               if (!extension_loaded('xml') || !extension_loaded('pcre'))
-               {
-                       $this->error = 'XML or PCRE extensions not loaded!';
-                       return false;
-               }
-               // Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
-               elseif (!extension_loaded('xmlreader'))
-               {
-                       static $xml_is_sane = null;
-                       if ($xml_is_sane === null)
-                       {
-                               $parser_check = xml_parser_create();
-                               xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
-                               xml_parser_free($parser_check);
-                               $xml_is_sane = isset($values[0]['value']);
-                       }
-                       if (!$xml_is_sane)
-                       {
-                               return false;
-                       }
-               }
-
-               // The default sanitize class gets set in the constructor, check if it has
-               // changed.
-               if ($this->registry->get_class('Sanitize') !== 'SimplePie_Sanitize') {
-                       $this->sanitize = $this->registry->create('Sanitize');
-               }
-               if (method_exists($this->sanitize, 'set_registry'))
-               {
-                       $this->sanitize->set_registry($this->registry);
-               }
-
-               // Pass whatever was set with config options over to the sanitizer.
-               // Pass the classes in for legacy support; new classes should use the registry instead
-               $this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache'));
-               $this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen, $this->curl_options);
-
-               if (!empty($this->multifeed_url))
-               {
-                       $i = 0;
-                       $success = 0;
-                       $this->multifeed_objects = array();
-                       $this->error = array();
-                       foreach ($this->multifeed_url as $url)
-                       {
-                               $this->multifeed_objects[$i] = clone $this;
-                               $this->multifeed_objects[$i]->set_feed_url($url);
-                               $single_success = $this->multifeed_objects[$i]->init();
-                               $success |= $single_success;
-                               if (!$single_success)
-                               {
-                                       $this->error[$i] = $this->multifeed_objects[$i]->error();
-                               }
-                               $i++;
-                       }
-                       return (bool) $success;
-               }
-               elseif ($this->feed_url === null && $this->raw_data === null)
-               {
-                       return false;
-               }
-
-               $this->error = null;
-               $this->data = array();
-               $this->check_modified = false;
-               $this->multifeed_objects = array();
-               $cache = false;
-
-               if ($this->feed_url !== null)
-               {
-                       $parsed_feed_url = $this->registry->call('Misc', 'parse_url', array($this->feed_url));
-
-                       // Decide whether to enable caching
-                       if ($this->cache && $parsed_feed_url['scheme'] !== '')
-                       {
-                               $filename = $this->get_cache_filename($this->feed_url);
-                               $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $filename, 'spc'));
-                       }
-
-                       // Fetch the data via SimplePie_File into $this->raw_data
-                       if (($fetched = $this->fetch_data($cache)) === true)
-                       {
-                               return true;
-                       }
-                       elseif ($fetched === false) {
-                               return false;
-                       }
-
-                       list($headers, $sniffed) = $fetched;
-               }
-
-               // Empty response check
-               if(empty($this->raw_data)){
-                       $this->error = "A feed could not be found at `$this->feed_url`. Empty body.";
-                       $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
-                       return false;
-               }
-
-               // Set up array of possible encodings
-               $encodings = array();
-
-               // First check to see if input has been overridden.
-               if ($this->input_encoding !== false)
-               {
-                       $encodings[] = strtoupper($this->input_encoding);
-               }
-
-               $application_types = array('application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity');
-               $text_types = array('text/xml', 'text/xml-external-parsed-entity');
-
-               // RFC 3023 (only applies to sniffed content)
-               if (isset($sniffed))
-               {
-                       if (in_array($sniffed, $application_types) || substr($sniffed, 0, 12) === 'application/' && substr($sniffed, -4) === '+xml')
-                       {
-                               if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
-                               {
-                                       $encodings[] = strtoupper($charset[1]);
-                               }
-                               $encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
-                               $encodings[] = 'UTF-8';
-                       }
-                       elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
-                       {
-                               if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
-                               {
-                                       $encodings[] = strtoupper($charset[1]);
-                               }
-                               $encodings[] = 'US-ASCII';
-                       }
-                       // Text MIME-type default
-                       elseif (substr($sniffed, 0, 5) === 'text/')
-                       {
-                               $encodings[] = 'UTF-8';
-                       }
-               }
-
-               // Fallback to XML 1.0 Appendix F.1/UTF-8/ISO-8859-1
-               $encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
-               $encodings[] = 'UTF-8';
-               $encodings[] = 'ISO-8859-1';
-
-               // There's no point in trying an encoding twice
-               $encodings = array_unique($encodings);
-
-               // Loop through each possible encoding, till we return something, or run out of possibilities
-               foreach ($encodings as $encoding)
-               {
-                       // Change the encoding to UTF-8 (as we always use UTF-8 internally)
-                       if ($utf8_data = $this->registry->call('Misc', 'change_encoding', array($this->raw_data, $encoding, 'UTF-8')))
-                       {
-                               // Create new parser
-                               $parser = $this->registry->create('Parser');
-
-                               // If it's parsed fine
-                               if ($parser->parse($utf8_data, 'UTF-8', $this->permanent_url))
-                               {
-                                       $this->data = $parser->get_data();
-                                       if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
-                                       {
-                                               $this->error = "A feed could not be found at `$this->feed_url`. This does not appear to be a valid RSS or Atom feed.";
-                                               $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
-                                               return false;
-                                       }
-
-                                       if (isset($headers))
-                                       {
-                                               $this->data['headers'] = $headers;
-                                       }
-                                       $this->data['build'] = SIMPLEPIE_BUILD;
-
-                                       // Cache the file if caching is enabled
-                                       if ($cache && !$cache->save($this))
-                                       {
-                                               trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
-                                       }
-                                       return true;
-                               }
-                       }
-               }
-
-               if (isset($parser))
-               {
-                       // We have an error, just set SimplePie_Misc::error to it and quit
-                       $this->error = $this->feed_url;
-                       $this->error .= sprintf(' is invalid XML, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
-               }
-               else
-               {
-                       $this->error = 'The data could not be converted to UTF-8.';
-                       if (!extension_loaded('mbstring') && !extension_loaded('iconv') && !class_exists('\UConverter')) {
-                               $this->error .= ' You MUST have either the iconv, mbstring or intl (PHP 5.5+) extension installed and enabled.';
-                       } else {
-                               $missingExtensions = array();
-                               if (!extension_loaded('iconv')) {
-                                       $missingExtensions[] = 'iconv';
-                               }
-                               if (!extension_loaded('mbstring')) {
-                                       $missingExtensions[] = 'mbstring';
-                               }
-                               if (!class_exists('\UConverter')) {
-                                       $missingExtensions[] = 'intl (PHP 5.5+)';
-                               }
-                               $this->error .= ' Try installing/enabling the ' . implode(' or ', $missingExtensions) . ' extension.';
-                       }
-               }
-
-               $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
-
-               return false;
-       }
-
-       /**
-        * Fetch the data via SimplePie_File
-        *
-        * If the data is already cached, attempt to fetch it from there instead
-        * @param SimplePie_Cache_Base|false $cache Cache handler, or false to not load from the cache
-        * @return array|true Returns true if the data was loaded from the cache, or an array of HTTP headers and sniffed type
-        */
-       protected function fetch_data(&$cache)
-       {
-               // If it's enabled, use the cache
-               if ($cache)
-               {
-                       // Load the Cache
-                       $this->data = $cache->load();
-                       if (!empty($this->data))
-                       {
-                               // If the cache is for an outdated build of SimplePie
-                               if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
-                               {
-                                       $cache->unlink();
-                                       $this->data = array();
-                               }
-                               // If we've hit a collision just rerun it with caching disabled
-                               elseif (isset($this->data['url']) && $this->data['url'] !== $this->feed_url)
-                               {
-                                       $cache = false;
-                                       $this->data = array();
-                               }
-                               // If we've got a non feed_url stored (if the page isn't actually a feed, or is a redirect) use that URL.
-                               elseif (isset($this->data['feed_url']))
-                               {
-                                       // If the autodiscovery cache is still valid use it.
-                                       if ($cache->mtime() + $this->autodiscovery_cache_duration > time())
-                                       {
-                                               // Do not need to do feed autodiscovery yet.
-                                               if ($this->data['feed_url'] !== $this->data['url'])
-                                               {
-                                                       $this->set_feed_url($this->data['feed_url']);
-                                                       return $this->init();
-                                               }
-
-                                               $cache->unlink();
-                                               $this->data = array();
-                                       }
-                               }
-                               // Check if the cache has been updated
-                               elseif ($cache->mtime() + $this->cache_duration < time())
-                               {
-                                       // Want to know if we tried to send last-modified and/or etag headers
-                                       // when requesting this file. (Note that it's up to the file to
-                                       // support this, but we don't always send the headers either.)
-                                       $this->check_modified = true;
-                                       if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag']))
-                                       {
-                                               $headers = array(
-                                                       'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
-                                               );
-                                               if (isset($this->data['headers']['last-modified']))
-                                               {
-                                                       $headers['if-modified-since'] = $this->data['headers']['last-modified'];
-                                               }
-                                               if (isset($this->data['headers']['etag']))
-                                               {
-                                                       $headers['if-none-match'] = $this->data['headers']['etag'];
-                                               }
-
-                                               $file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
-                                               $this->status_code = $file->status_code;
-
-                                               if ($file->success)
-                                               {
-                                                       if ($file->status_code === 304)
-                                                       {
-                                                               // Set raw_data to false here too, to signify that the cache
-                                                               // is still valid.
-                                                               $this->raw_data = false;
-                                                               $cache->touch();
-                                                               return true;
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       $this->check_modified = false;
-                                                       if($this->force_cache_fallback)
-                                                       {
-                                                               $cache->touch();
-                                                               return true;
-                                                       }
-
-                                                       unset($file);
-                                               }
-                                       }
-                               }
-                               // If the cache is still valid, just return true
-                               else
-                               {
-                                       $this->raw_data = false;
-                                       return true;
-                               }
-                       }
-                       // If the cache is empty, delete it
-                       else
-                       {
-                               $cache->unlink();
-                               $this->data = array();
-                       }
-               }
-               // If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
-               if (!isset($file))
-               {
-                       if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
-                       {
-                               $file =& $this->file;
-                       }
-                       else
-                       {
-                               $headers = array(
-                                       'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
-                               );
-                               $file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
-                       }
-               }
-               $this->status_code = $file->status_code;
-
-               // If the file connection has an error, set SimplePie::error to that and quit
-               if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
-               {
-                       $this->error = $file->error;
-                       return !empty($this->data);
-               }
-
-               if (!$this->force_feed)
-               {
-                       // Check if the supplied URL is a feed, if it isn't, look for it.
-                       $locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds, $this->force_fsockopen, $this->curl_options));
-
-                       if (!$locate->is_feed($file))
-                       {
-                               $copyStatusCode = $file->status_code;
-                               $copyContentType = $file->headers['content-type'];
-                               try
-                               {
-                                       $microformats = false;
-                                       if (class_exists('DOMXpath') && function_exists('Mf2\parse')) {
-                                               $doc = new DOMDocument();
-                                               @$doc->loadHTML($file->body);
-                                               $xpath = new DOMXpath($doc);
-                                               // Check for both h-feed and h-entry, as both a feed with no entries
-                                               // and a list of entries without an h-feed wrapper are both valid.
-                                               $query = '//*[contains(concat(" ", @class, " "), " h-feed ") or '.
-                                                       'contains(concat(" ", @class, " "), " h-entry ")]';
-                                               $result = $xpath->query($query);
-                                               $microformats = $result->length !== 0;
-                                       }
-                                       // Now also do feed discovery, but if microformats were found don't
-                                       // overwrite the current value of file.
-                                       $discovered = $locate->find($this->autodiscovery,
-                                                                   $this->all_discovered_feeds);
-                                       if ($microformats)
-                                       {
-                                               if ($hub = $locate->get_rel_link('hub'))
-                                               {
-                                                       $self = $locate->get_rel_link('self');
-                                                       $this->store_links($file, $hub, $self);
-                                               }
-                                               // Push the current file onto all_discovered feeds so the user can
-                                               // be shown this as one of the options.
-                                               if (isset($this->all_discovered_feeds)) {
-                                                       $this->all_discovered_feeds[] = $file;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               if ($discovered)
-                                               {
-                                                       $file = $discovered;
-                                               }
-                                               else
-                                               {
-                                                       // We need to unset this so that if SimplePie::set_file() has
-                                                       // been called that object is untouched
-                                                       unset($file);
-                                                       $this->error = "A feed could not be found at `$this->feed_url`; the status code is `$copyStatusCode` and content-type is `$copyContentType`";
-                                                       $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
-                                                       return false;
-                                               }
-                                       }
-                               }
-                               catch (SimplePie_Exception $e)
-                               {
-                                       // We need to unset this so that if SimplePie::set_file() has been called that object is untouched
-                                       unset($file);
-                                       // This is usually because DOMDocument doesn't exist
-                                       $this->error = $e->getMessage();
-                                       $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, $e->getFile(), $e->getLine()));
-                                       return false;
-                               }
-                               if ($cache)
-                               {
-                                       $this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
-                                       if (!$cache->save($this))
-                                       {
-                                               trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
-                                       }
-                                       $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
-                               }
-                       }
-                       $this->feed_url = $file->url;
-                       $locate = null;
-               }
-
-               $this->raw_data = $file->body;
-               $this->permanent_url = $file->permanent_url;
-               $headers = $file->headers;
-               $sniffer = $this->registry->create('Content_Type_Sniffer', array(&$file));
-               $sniffed = $sniffer->get_type();
-
-               return array($headers, $sniffed);
-       }
-
-       /**
-        * Get the error message for the occurred error
-        *
-        * @return string|array Error message, or array of messages for multifeeds
-        */
-       public function error()
-       {
-               return $this->error;
-       }
-
-       /**
-        * Get the last HTTP status code
-        *
-        * @return int Status code
-        */
-       public function status_code()
-       {
-               return $this->status_code;
-       }
-
-       /**
-        * Get the raw XML
-        *
-        * This is the same as the old `$feed->enable_xml_dump(true)`, but returns
-        * the data instead of printing it.
-        *
-        * @return string|boolean Raw XML data, false if the cache is used
-        */
-       public function get_raw_data()
-       {
-               return $this->raw_data;
-       }
-
-       /**
-        * Get the character encoding used for output
-        *
-        * @since Preview Release
-        * @return string
-        */
-       public function get_encoding()
-       {
-               return $this->sanitize->output_encoding;
-       }
-
-       /**
-        * Send the Content-Type header with correct encoding
-        *
-        * This method ensures that the SimplePie-enabled page is being served with
-        * the correct {@link http://www.iana.org/assignments/media-types/ mime-type}
-        * and character encoding HTTP headers (character encoding determined by the
-        * {@see set_output_encoding} config option).
-        *
-        * This won't work properly if any content or whitespace has already been
-        * sent to the browser, because it relies on PHP's
-        * {@link http://php.net/header header()} function, and these are the
-        * circumstances under which the function works.
-        *
-        * Because it's setting these settings for the entire page (as is the nature
-        * of HTTP headers), this should only be used once per page (again, at the
-        * top).
-        *
-        * @param string $mime MIME type to serve the page as
-        */
-       public function handle_content_type($mime = 'text/html')
-       {
-               if (!headers_sent())
-               {
-                       $header = "Content-Type: $mime;";
-                       if ($this->get_encoding())
-                       {
-                               $header .= ' charset=' . $this->get_encoding();
-                       }
-                       else
-                       {
-                               $header .= ' charset=UTF-8';
-                       }
-                       header($header);
-               }
-       }
-
-       /**
-        * Get the type of the feed
-        *
-        * This returns a SIMPLEPIE_TYPE_* constant, which can be tested against
-        * using {@link http://php.net/language.operators.bitwise bitwise operators}
-        *
-        * @since 0.8 (usage changed to using constants in 1.0)
-        * @see SIMPLEPIE_TYPE_NONE Unknown.
-        * @see SIMPLEPIE_TYPE_RSS_090 RSS 0.90.
-        * @see SIMPLEPIE_TYPE_RSS_091_NETSCAPE RSS 0.91 (Netscape).
-        * @see SIMPLEPIE_TYPE_RSS_091_USERLAND RSS 0.91 (Userland).
-        * @see SIMPLEPIE_TYPE_RSS_091 RSS 0.91.
-        * @see SIMPLEPIE_TYPE_RSS_092 RSS 0.92.
-        * @see SIMPLEPIE_TYPE_RSS_093 RSS 0.93.
-        * @see SIMPLEPIE_TYPE_RSS_094 RSS 0.94.
-        * @see SIMPLEPIE_TYPE_RSS_10 RSS 1.0.
-        * @see SIMPLEPIE_TYPE_RSS_20 RSS 2.0.x.
-        * @see SIMPLEPIE_TYPE_RSS_RDF RDF-based RSS.
-        * @see SIMPLEPIE_TYPE_RSS_SYNDICATION Non-RDF-based RSS (truly intended as syndication format).
-        * @see SIMPLEPIE_TYPE_RSS_ALL Any version of RSS.
-        * @see SIMPLEPIE_TYPE_ATOM_03 Atom 0.3.
-        * @see SIMPLEPIE_TYPE_ATOM_10 Atom 1.0.
-        * @see SIMPLEPIE_TYPE_ATOM_ALL Any version of Atom.
-        * @see SIMPLEPIE_TYPE_ALL Any known/supported feed type.
-        * @return int SIMPLEPIE_TYPE_* constant
-        */
-       public function get_type()
-       {
-               if (!isset($this->data['type']))
-               {
-                       $this->data['type'] = SIMPLEPIE_TYPE_ALL;
-                       if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
-                       {
-                               $this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
-                       }
-                       elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
-                       {
-                               $this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
-                       }
-                       elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
-                       {
-                               if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
-                               || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
-                               || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item'])
-                               || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['textinput']))
-                               {
-                                       $this->data['type'] &= SIMPLEPIE_TYPE_RSS_10;
-                               }
-                               if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['channel'])
-                               || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['image'])
-                               || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item'])
-                               || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['textinput']))
-                               {
-                                       $this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
-                               }
-                       }
-                       elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
-                       {
-                               $this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
-                               if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
-                               {
-                                       switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
-                                       {
-                                               case '0.91':
-                                                       $this->data['type'] &= SIMPLEPIE_TYPE_RSS_091;
-                                                       if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data']))
-                                                       {
-                                                               switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data']))
-                                                               {
-                                                                       case '0':
-                                                                               $this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_NETSCAPE;
-                                                                               break;
-
-                                                                       case '24':
-                                                                               $this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_USERLAND;
-                                                                               break;
-                                                               }
-                                                       }
-                                                       break;
-
-                                               case '0.92':
-                                                       $this->data['type'] &= SIMPLEPIE_TYPE_RSS_092;
-                                                       break;
-
-                                               case '0.93':
-                                                       $this->data['type'] &= SIMPLEPIE_TYPE_RSS_093;
-                                                       break;
-
-                                               case '0.94':
-                                                       $this->data['type'] &= SIMPLEPIE_TYPE_RSS_094;
-                                                       break;
-
-                                               case '2.0':
-                                                       $this->data['type'] &= SIMPLEPIE_TYPE_RSS_20;
-                                                       break;
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               $this->data['type'] = SIMPLEPIE_TYPE_NONE;
-                       }
-               }
-               return $this->data['type'];
-       }
-
-       /**
-        * Get the URL for the feed
-        *
-        * When the 'permanent' mode is enabled, returns the original feed URL,
-        * except in the case of an `HTTP 301 Moved Permanently` status response,
-        * in which case the location of the first redirection is returned.
-        *
-        * When the 'permanent' mode is disabled (default),
-        * may or may not be different from the URL passed to {@see set_feed_url()},
-        * depending on whether auto-discovery was used, and whether there were
-        * any redirects along the way.
-        *
-        * @since Preview Release (previously called `get_feed_url()` since SimplePie 0.8.)
-        * @todo Support <itunes:new-feed-url>
-        * @todo Also, |atom:link|@rel=self
-        * @param bool $permanent Permanent mode to return only the original URL or the first redirection
-        * iff it is a 301 redirection
-        * @return string|null
-        */
-       public function subscribe_url($permanent = false)
-       {
-               if ($permanent)
-               {
-                       if ($this->permanent_url !== null)
-                       {
-                               // sanitize encodes ampersands which are required when used in a url.
-                               return str_replace('&amp;', '&',
-                                                  $this->sanitize($this->permanent_url,
-                                                                  SIMPLEPIE_CONSTRUCT_IRI));
-                       }
-               }
-               else
-               {
-                       if ($this->feed_url !== null)
-                       {
-                               return str_replace('&amp;', '&',
-                                                  $this->sanitize($this->feed_url,
-                                                                  SIMPLEPIE_CONSTRUCT_IRI));
-                       }
-               }
-               return null;
-       }
-
-       /**
-        * Get data for an feed-level element
-        *
-        * This method allows you to get access to ANY element/attribute that is a
-        * sub-element of the opening feed tag.
-        *
-        * The return value is an indexed array of elements matching the given
-        * namespace and tag name. Each element has `attribs`, `data` and `child`
-        * subkeys. For `attribs` and `child`, these contain namespace subkeys.
-        * `attribs` then has one level of associative name => value data (where
-        * `value` is a string) after the namespace. `child` has tag-indexed keys
-        * after the namespace, each member of which is an indexed array matching
-        * this same format.
-        *
-        * For example:
-        * <pre>
-        * // This is probably a bad example because we already support
-        * // <media:content> natively, but it shows you how to parse through
-        * // the nodes.
-        * $group = $item->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group');
-        * $content = $group[0]['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'];
-        * $file = $content[0]['attribs']['']['url'];
-        * echo $file;
-        * </pre>
-        *
-        * @since 1.0
-        * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
-        * @param string $namespace The URL of the XML namespace of the elements you're trying to access
-        * @param string $tag Tag name
-        * @return array
-        */
-       public function get_feed_tags($namespace, $tag)
-       {
-               $type = $this->get_type();
-               if ($type & SIMPLEPIE_TYPE_ATOM_10)
-               {
-                       if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]))
-                       {
-                               return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
-                       }
-               }
-               if ($type & SIMPLEPIE_TYPE_ATOM_03)
-               {
-                       if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]))
-                       {
-                               return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
-                       }
-               }
-               if ($type & SIMPLEPIE_TYPE_RSS_RDF)
-               {
-                       if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]))
-                       {
-                               return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
-                       }
-               }
-               if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
-               {
-                       if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag]))
-                       {
-                               return $this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag];
-                       }
-               }
-               return null;
-       }
-
-       /**
-        * Get data for an channel-level element
-        *
-        * This method allows you to get access to ANY element/attribute in the
-        * channel/header section of the feed.
-        *
-        * See {@see SimplePie::get_feed_tags()} for a description of the return value
-        *
-        * @since 1.0
-        * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
-        * @param string $namespace The URL of the XML namespace of the elements you're trying to access
-        * @param string $tag Tag name
-        * @return array
-        */
-       public function get_channel_tags($namespace, $tag)
-       {
-               $type = $this->get_type();
-               if ($type & SIMPLEPIE_TYPE_ATOM_ALL)
-               {
-                       if ($return = $this->get_feed_tags($namespace, $tag))
-                       {
-                               return $return;
-                       }
-               }
-               if ($type & SIMPLEPIE_TYPE_RSS_10)
-               {
-                       if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel'))
-                       {
-                               if (isset($channel[0]['child'][$namespace][$tag]))
-                               {
-                                       return $channel[0]['child'][$namespace][$tag];
-                               }
-                       }
-               }
-               if ($type & SIMPLEPIE_TYPE_RSS_090)
-               {
-                       if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel'))
-                       {
-                               if (isset($channel[0]['child'][$namespace][$tag]))
-                               {
-                                       return $channel[0]['child'][$namespace][$tag];
-                               }
-                       }
-               }
-               if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
-               {
-                       if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'channel'))
-                       {
-                               if (isset($channel[0]['child'][$namespace][$tag]))
-                               {
-                                       return $channel[0]['child'][$namespace][$tag];
-                               }
-                       }
-               }
-               return null;
-       }
-
-       /**
-        * Get data for an channel-level element
-        *
-        * This method allows you to get access to ANY element/attribute in the
-        * image/logo section of the feed.
-        *
-        * See {@see SimplePie::get_feed_tags()} for a description of the return value
-        *
-        * @since 1.0
-        * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
-        * @param string $namespace The URL of the XML namespace of the elements you're trying to access
-        * @param string $tag Tag name
-        * @return array
-        */
-       public function get_image_tags($namespace, $tag)
-       {
-               $type = $this->get_type();
-               if ($type & SIMPLEPIE_TYPE_RSS_10)
-               {
-                       if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image'))
-                       {
-                               if (isset($image[0]['child'][$namespace][$tag]))
-                               {
-                                       return $image[0]['child'][$namespace][$tag];
-                               }
-                       }
-               }
-               if ($type & SIMPLEPIE_TYPE_RSS_090)
-               {
-                       if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image'))
-                       {
-                               if (isset($image[0]['child'][$namespace][$tag]))
-                               {
-                                       return $image[0]['child'][$namespace][$tag];
-                               }
-                       }
-               }
-               if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
-               {
-                       if ($image = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'image'))
-                       {
-                               if (isset($image[0]['child'][$namespace][$tag]))
-                               {
-                                       return $image[0]['child'][$namespace][$tag];
-                               }
-                       }
-               }
-               return null;
-       }
-
-       /**
-        * Get the base URL value from the feed
-        *
-        * Uses `<xml:base>` if available, otherwise uses the first link in the
-        * feed, or failing that, the URL of the feed itself.
-        *
-        * @see get_link
-        * @see subscribe_url
-        *
-        * @param array $element
-        * @return string
-        */
-       public function get_base($element = array())
-       {
-               if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
-               {
-                       return $element['xml_base'];
-               }
-               elseif ($this->get_link() !== null)
-               {
-                       return $this->get_link();
-               }
-
-               return $this->subscribe_url();
-       }
-
-       /**
-        * Sanitize feed data
-        *
-        * @access private
-        * @see SimplePie_Sanitize::sanitize()
-        * @param string $data Data to sanitize
-        * @param int $type One of the SIMPLEPIE_CONSTRUCT_* constants
-        * @param string $base Base URL to resolve URLs against
-        * @return string Sanitized data
-        */
-       public function sanitize($data, $type, $base = '')
-       {
-               try
-               {
-                       return $this->sanitize->sanitize($data, $type, $base);
-               }
-               catch (SimplePie_Exception $e)
-               {
-                       if (!$this->enable_exceptions)
-                       {
-                               $this->error = $e->getMessage();
-                               $this->registry->call('Misc', 'error', array($this->error, E_USER_WARNING, $e->getFile(), $e->getLine()));
-                               return '';
-                       }
-
-                       throw $e;
-               }
-       }
-
-       /**
-        * Get the title of the feed
-        *
-        * Uses `<atom:title>`, `<title>` or `<dc:title>`
-        *
-        * @since 1.0 (previously called `get_feed_title` since 0.8)
-        * @return string|null
-        */
-       public function get_title()
-       {
-               if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a category for the feed
-        *
-        * @since Unknown
-        * @param int $key The category that you want to return. Remember that arrays begin with 0, not 1
-        * @return SimplePie_Category|null
-        */
-       public function get_category($key = 0)
-       {
-               $categories = $this->get_categories();
-               if (isset($categories[$key]))
-               {
-                       return $categories[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all categories for the feed
-        *
-        * Uses `<atom:category>`, `<category>` or `<dc:subject>`
-        *
-        * @since Unknown
-        * @return array|null List of {@see SimplePie_Category} objects
-        */
-       public function get_categories()
-       {
-               $categories = array();
-
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
-               {
-                       $term = null;
-                       $scheme = null;
-                       $label = null;
-                       if (isset($category['attribs']['']['term']))
-                       {
-                               $term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($category['attribs']['']['scheme']))
-                       {
-                               $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($category['attribs']['']['label']))
-                       {
-                               $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       $categories[] = $this->registry->create('Category', array($term, $scheme, $label));
-               }
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
-               {
-                       // This is really the label, but keep this as the term also for BC.
-                       // Label will also work on retrieving because that falls back to term.
-                       $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       if (isset($category['attribs']['']['domain']))
-                       {
-                               $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       else
-                       {
-                               $scheme = null;
-                       }
-                       $categories[] = $this->registry->create('Category', array($term, $scheme, null));
-               }
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
-               {
-                       $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
-               {
-                       $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-
-               if (!empty($categories))
-               {
-                       return array_unique($categories);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get an author for the feed
-        *
-        * @since 1.1
-        * @param int $key The author that you want to return. Remember that arrays begin with 0, not 1
-        * @return SimplePie_Author|null
-        */
-       public function get_author($key = 0)
-       {
-               $authors = $this->get_authors();
-               if (isset($authors[$key]))
-               {
-                       return $authors[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all authors for the feed
-        *
-        * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>`
-        *
-        * @since 1.1
-        * @return array|null List of {@see SimplePie_Author} objects
-        */
-       public function get_authors()
-       {
-               $authors = array();
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
-               {
-                       $name = null;
-                       $uri = null;
-                       $email = null;
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
-                       {
-                               $uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
-                       }
-                       if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $uri !== null)
-                       {
-                               $authors[] = $this->registry->create('Author', array($name, $uri, $email));
-                       }
-               }
-               if ($author = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
-               {
-                       $name = null;
-                       $url = null;
-                       $email = null;
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
-                       {
-                               $url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
-                       }
-                       if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $url !== null)
-                       {
-                               $authors[] = $this->registry->create('Author', array($name, $url, $email));
-                       }
-               }
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
-               {
-                       $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
-               }
-
-               if (!empty($authors))
-               {
-                       return array_unique($authors);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a contributor for the feed
-        *
-        * @since 1.1
-        * @param int $key The contrbutor that you want to return. Remember that arrays begin with 0, not 1
-        * @return SimplePie_Author|null
-        */
-       public function get_contributor($key = 0)
-       {
-               $contributors = $this->get_contributors();
-               if (isset($contributors[$key]))
-               {
-                       return $contributors[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all contributors for the feed
-        *
-        * Uses `<atom:contributor>`
-        *
-        * @since 1.1
-        * @return array|null List of {@see SimplePie_Author} objects
-        */
-       public function get_contributors()
-       {
-               $contributors = array();
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
-               {
-                       $name = null;
-                       $uri = null;
-                       $email = null;
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
-                       {
-                               $uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $uri !== null)
-                       {
-                               $contributors[] = $this->registry->create('Author', array($name, $uri, $email));
-                       }
-               }
-               foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
-               {
-                       $name = null;
-                       $url = null;
-                       $email = null;
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
-                       {
-                               $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
-                       {
-                               $url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
-                       }
-                       if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
-                       {
-                               $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                       }
-                       if ($name !== null || $email !== null || $url !== null)
-                       {
-                               $contributors[] = $this->registry->create('Author', array($name, $url, $email));
-                       }
-               }
-
-               if (!empty($contributors))
-               {
-                       return array_unique($contributors);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get a single link for the feed
-        *
-        * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8)
-        * @param int $key The link that you want to return. Remember that arrays begin with 0, not 1
-        * @param string $rel The relationship of the link to return
-        * @return string|null Link URL
-        */
-       public function get_link($key = 0, $rel = 'alternate')
-       {
-               $links = $this->get_links($rel);
-               if (isset($links[$key]))
-               {
-                       return $links[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the permalink for the item
-        *
-        * Returns the first link available with a relationship of "alternate".
-        * Identical to {@see get_link()} with key 0
-        *
-        * @see get_link
-        * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8)
-        * @internal Added for parity between the parent-level and the item/entry-level.
-        * @return string|null Link URL
-        */
-       public function get_permalink()
-       {
-               return $this->get_link(0);
-       }
-
-       /**
-        * Get all links for the feed
-        *
-        * Uses `<atom:link>` or `<link>`
-        *
-        * @since Beta 2
-        * @param string $rel The relationship of links to return
-        * @return array|null Links found for the feed (strings)
-        */
-       public function get_links($rel = 'alternate')
-       {
-               if (!isset($this->data['links']))
-               {
-                       $this->data['links'] = array();
-                       if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
-                       {
-                               foreach ($links as $link)
-                               {
-                                       if (isset($link['attribs']['']['href']))
-                                       {
-                                               $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-                                               $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-                                       }
-                               }
-                       }
-                       if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'))
-                       {
-                               foreach ($links as $link)
-                               {
-                                       if (isset($link['attribs']['']['href']))
-                                       {
-                                               $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-                                               $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-
-                                       }
-                               }
-                       }
-                       if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-                       if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-                       if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
-                       {
-                               $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-                       }
-
-                       $keys = array_keys($this->data['links']);
-                       foreach ($keys as $key)
-                       {
-                               if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
-                               {
-                                       if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
-                                       {
-                                               $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-                                               $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-                                       }
-                                       else
-                                       {
-                                               $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
-                                       }
-                               }
-                               elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
-                               {
-                                       $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
-                               }
-                               $this->data['links'][$key] = array_unique($this->data['links'][$key]);
-                       }
-               }
-
-               if (isset($this->data['headers']['link']))
-               {
-                       $link_headers = $this->data['headers']['link'];
-                       if (is_string($link_headers)) {
-                               $link_headers = array($link_headers);
-                       }
-                       $matches = preg_filter('/<([^>]+)>; rel='.preg_quote($rel).'/', '$1', $link_headers);
-                       if (!empty($matches)) {
-                               return $matches;
-                       }
-               }
-
-               if (isset($this->data['links'][$rel]))
-               {
-                       return $this->data['links'][$rel];
-               }
-
-               return null;
-       }
-
-       public function get_all_discovered_feeds()
-       {
-               return $this->all_discovered_feeds;
-       }
-
-       /**
-        * Get the content for the item
-        *
-        * Uses `<atom:subtitle>`, `<atom:tagline>`, `<description>`,
-        * `<dc:description>`, `<itunes:summary>` or `<itunes:subtitle>`
-        *
-        * @since 1.0 (previously called `get_feed_description()` since 0.8)
-        * @return string|null
-        */
-       public function get_description()
-       {
-               if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the copyright info for the feed
-        *
-        * Uses `<atom:rights>`, `<atom:copyright>` or `<dc:rights>`
-        *
-        * @since 1.0 (previously called `get_feed_copyright()` since 0.8)
-        * @return string|null
-        */
-       public function get_copyright()
-       {
-               if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
-               {
-                       return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the language for the feed
-        *
-        * Uses `<language>`, `<dc:language>`, or @xml_lang
-        *
-        * @since 1.0 (previously called `get_feed_language()` since 0.8)
-        * @return string|null
-        */
-       public function get_language()
-       {
-               if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
-               {
-                       return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
-               {
-                       return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
-               {
-                       return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif (isset($this->data['headers']['content-language']))
-               {
-                       return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the latitude coordinates for the item
-        *
-        * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
-        *
-        * Uses `<geo:lat>` or `<georss:point>`
-        *
-        * @since 1.0
-        * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
-        * @link http://www.georss.org/ GeoRSS
-        * @return string|null
-        */
-       public function get_latitude()
-       {
-
-               if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
-               {
-                       return (float) $match[1];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the longitude coordinates for the feed
-        *
-        * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
-        *
-        * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>`
-        *
-        * @since 1.0
-        * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
-        * @link http://www.georss.org/ GeoRSS
-        * @return string|null
-        */
-       public function get_longitude()
-       {
-               if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
-               {
-                       return (float) $return[0]['data'];
-               }
-               elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
-               {
-                       return (float) $match[2];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the feed logo's title
-        *
-        * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" title.
-        *
-        * Uses `<image><title>` or `<image><dc:title>`
-        *
-        * @return string|null
-        */
-       public function get_image_title()
-       {
-               if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the feed logo's URL
-        *
-        * RSS 0.9.0, 2.0, Atom 1.0, and feeds with iTunes RSS tags are allowed to
-        * have a "feed logo" URL. This points directly to the image itself.
-        *
-        * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`,
-        * `<image><title>` or `<image><dc:title>`
-        *
-        * @return string|null
-        */
-       public function get_image_url()
-       {
-               if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
-               {
-                       return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-
-               return null;
-       }
-
-
-       /**
-        * Get the feed logo's link
-        *
-        * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" link. This
-        * points to a human-readable page that the image should link to.
-        *
-        * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`,
-        * `<image><title>` or `<image><dc:title>`
-        *
-        * @return string|null
-        */
-       public function get_image_link()
-       {
-               if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-               elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
-               {
-                       return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the feed logo's link
-        *
-        * RSS 2.0 feeds are allowed to have a "feed logo" width.
-        *
-        * Uses `<image><width>` or defaults to 88.0 if no width is specified and
-        * the feed is an RSS 2.0 feed.
-        *
-        * @return int|float|null
-        */
-       public function get_image_width()
-       {
-               if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
-               {
-                       return round($return[0]['data']);
-               }
-               elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
-               {
-                       return 88.0;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the feed logo's height
-        *
-        * RSS 2.0 feeds are allowed to have a "feed logo" height.
-        *
-        * Uses `<image><height>` or defaults to 31.0 if no height is specified and
-        * the feed is an RSS 2.0 feed.
-        *
-        * @return int|float|null
-        */
-       public function get_image_height()
-       {
-               if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
-               {
-                       return round($return[0]['data']);
-               }
-               elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
-               {
-                       return 31.0;
-               }
-
-               return null;
-       }
-
-       /**
-        * Get the number of items in the feed
-        *
-        * This is well-suited for {@link http://php.net/for for()} loops with
-        * {@see get_item()}
-        *
-        * @param int $max Maximum value to return. 0 for no limit
-        * @return int Number of items in the feed
-        */
-       public function get_item_quantity($max = 0)
-       {
-               $max = (int) $max;
-               $qty = count($this->get_items());
-               if ($max === 0)
-               {
-                       return $qty;
-               }
-
-               return ($qty > $max) ? $max : $qty;
-       }
-
-       /**
-        * Get a single item from the feed
-        *
-        * This is better suited for {@link http://php.net/for for()} loops, whereas
-        * {@see get_items()} is better suited for
-        * {@link http://php.net/foreach foreach()} loops.
-        *
-        * @see get_item_quantity()
-        * @since Beta 2
-        * @param int $key The item that you want to return. Remember that arrays begin with 0, not 1
-        * @return SimplePie_Item|null
-        */
-       public function get_item($key = 0)
-       {
-               $items = $this->get_items();
-               if (isset($items[$key]))
-               {
-                       return $items[$key];
-               }
-
-               return null;
-       }
-
-       /**
-        * Get all items from the feed
-        *
-        * This is better suited for {@link http://php.net/for for()} loops, whereas
-        * {@see get_items()} is better suited for
-        * {@link http://php.net/foreach foreach()} loops.
-        *
-        * @see get_item_quantity
-        * @since Beta 2
-        * @param int $start Index to start at
-        * @param int $end Number of items to return. 0 for all items after `$start`
-        * @return SimplePie_Item[]|null List of {@see SimplePie_Item} objects
-        */
-       public function get_items($start = 0, $end = 0)
-       {
-               if (!isset($this->data['items']))
-               {
-                       if (!empty($this->multifeed_objects))
-                       {
-                               $this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
-                               if (empty($this->data['items']))
-                               {
-                                       return array();
-                               }
-                               return $this->data['items'];
-                       }
-                       $this->data['items'] = array();
-                       if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
-                       {
-                               $keys = array_keys($items);
-                               foreach ($keys as $key)
-                               {
-                                       $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
-                               }
-                       }
-                       if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
-                       {
-                               $keys = array_keys($items);
-                               foreach ($keys as $key)
-                               {
-                                       $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
-                               }
-                       }
-                       if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
-                       {
-                               $keys = array_keys($items);
-                               foreach ($keys as $key)
-                               {
-                                       $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
-                               }
-                       }
-                       if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
-                       {
-                               $keys = array_keys($items);
-                               foreach ($keys as $key)
-                               {
-                                       $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
-                               }
-                       }
-                       if ($items = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'item'))
-                       {
-                               $keys = array_keys($items);
-                               foreach ($keys as $key)
-                               {
-                                       $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
-                               }
-                       }
-               }
-
-               if (empty($this->data['items']))
-               {
-                       return array();
-               }
-
-               if ($this->order_by_date)
-               {
-                       if (!isset($this->data['ordered_items']))
-                       {
-                               $this->data['ordered_items'] = $this->data['items'];
-                               usort($this->data['ordered_items'], array(get_class($this), 'sort_items'));
-                       }
-                       $items = $this->data['ordered_items'];
-               }
-               else
-               {
-                       $items = $this->data['items'];
-               }
-               // Slice the data as desired
-               if ($end === 0)
-               {
-                       return array_slice($items, $start);
-               }
-
-               return array_slice($items, $start, $end);
-       }
-
-       /**
-        * Set the favicon handler
-        *
-        * @deprecated Use your own favicon handling instead
-        */
-       public function set_favicon_handler($page = false, $qs = 'i')
-       {
-               $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
-               trigger_error('Favicon handling has been removed, please use your own handling', $level);
-               return false;
-       }
-
-       /**
-        * Get the favicon for the current feed
-        *
-        * @deprecated Use your own favicon handling instead
-        */
-       public function get_favicon()
-       {
-               $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
-               trigger_error('Favicon handling has been removed, please use your own handling', $level);
-
-               if (($url = $this->get_link()) !== null)
-               {
-                       return 'https://www.google.com/s2/favicons?domain=' . urlencode($url);
-               }
-
-               return false;
-       }
-
-       /**
-        * Magic method handler
-        *
-        * @param string $method Method name
-        * @param array $args Arguments to the method
-        * @return mixed
-        */
-       public function __call($method, $args)
-       {
-               if (strpos($method, 'subscribe_') === 0)
-               {
-                       $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
-                       trigger_error('subscribe_*() has been deprecated, implement the callback yourself', $level);
-                       return '';
-               }
-               if ($method === 'enable_xml_dump')
-               {
-                       $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
-                       trigger_error('enable_xml_dump() has been deprecated, use get_raw_data() instead', $level);
-                       return false;
-               }
-
-               $class = get_class($this);
-               $trace = debug_backtrace(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection
-               $file = $trace[0]['file'];
-               $line = $trace[0]['line'];
-               trigger_error("Call to undefined method $class::$method() in $file on line $line", E_USER_ERROR);
-       }
-
-       /**
-        * Sorting callback for items
-        *
-        * @access private
-        * @param SimplePie $a
-        * @param SimplePie $b
-        * @return boolean
-        */
-       public static function sort_items($a, $b)
-       {
-               $a_date = $a->get_date('U');
-               $b_date = $b->get_date('U');
-               if ($a_date && $b_date) {
-                       return $a_date > $b_date ? -1 : 1;
-               }
-               // Sort items without dates to the top.
-               if ($a_date) {
-                       return 1;
-               }
-               if ($b_date) {
-                       return -1;
-               }
-               return 0;
-       }
-
-       /**
-        * Merge items from several feeds into one
-        *
-        * If you're merging multiple feeds together, they need to all have dates
-        * for the items or else SimplePie will refuse to sort them.
-        *
-        * @link http://simplepie.org/wiki/tutorial/sort_multiple_feeds_by_time_and_date#if_feeds_require_separate_per-feed_settings
-        * @param array $urls List of SimplePie feed objects to merge
-        * @param int $start Starting item
-        * @param int $end Number of items to return
-        * @param int $limit Maximum number of items per feed
-        * @return array
-        */
-       public static function merge_items($urls, $start = 0, $end = 0, $limit = 0)
-       {
-               if (is_array($urls) && sizeof($urls) > 0)
-               {
-                       $items = array();
-                       foreach ($urls as $arg)
-                       {
-                               if ($arg instanceof SimplePie)
-                               {
-                                       $items = array_merge($items, $arg->get_items(0, $limit));
-                               }
-                               else
-                               {
-                                       trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
-                               }
-                       }
-
-                       usort($items, array(get_class($urls[0]), 'sort_items'));
-
-                       if ($end === 0)
-                       {
-                               return array_slice($items, $start);
-                       }
-
-                       return array_slice($items, $start, $end);
-               }
-
-               trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
-               return array();
-       }
-
-       /**
-        * Store PubSubHubbub links as headers
-        *
-        * There is no way to find PuSH links in the body of a microformats feed,
-        * so they are added to the headers when found, to be used later by get_links.
-        * @param SimplePie_File $file
-        * @param string $hub
-        * @param string $self
-        */
-       private function store_links(&$file, $hub, $self) {
-               if (isset($file->headers['link']['hub']) ||
-                         (isset($file->headers['link']) &&
-                          preg_match('/rel=hub/', $file->headers['link'])))
-               {
-                       return;
-               }
-
-               if ($hub)
-               {
-                       if (isset($file->headers['link']))
-                       {
-                               if ($file->headers['link'] !== '')
-                               {
-                                       $file->headers['link'] = ', ';
-                               }
-                       }
-                       else
-                       {
-                               $file->headers['link'] = '';
-                       }
-                       $file->headers['link'] .= '<'.$hub.'>; rel=hub';
-                       if ($self)
-                       {
-                               $file->headers['link'] .= ', <'.$self.'>; rel=self';
-                       }
-               }
-       }
-}
-endif;
</del></span></pre></div>
<a id="trunksrcwpincludesclasswpfeedcachetransientphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-feed-cache-transient.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-feed-cache-transient.php   2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/class-wp-feed-cache-transient.php     2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,9 +11,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * Core class used to implement feed cache transients.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 2.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.7.0 Now properly implements the SimplePie\Cache\Base interface.
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> #[AllowDynamicProperties]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class WP_Feed_Cache_Transient {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WP_Feed_Cache_Transient implements SimplePie\Cache\Base {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Holds the transient name.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,18 +43,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">        public $lifetime = 43200;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Constructor.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Creates a new (transient) cache object.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.2.0 Updated to use a PHP5 constructor.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 6.7.0 Parameter names have been updated to be in line with the `SimplePie\Cache\Base` interface.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param string $location  URL location (scheme is used to determine handler).
-        * @param string $filename  Unique identifier for cache object.
-        * @param string $extension 'spi' or 'spc'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param string                           $location URL location (scheme is used to determine handler).
+        * @param string                           $name     Unique identifier for cache object.
+        * @param Base::TYPE_FEED|Base::TYPE_IMAGE $type     Either `TYPE_FEED` ('spc') for SimplePie data,
+        *                                                   or `TYPE_IMAGE` ('spi') for image data.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function __construct( $location, $filename, $extension ) {
-               $this->name     = 'feed_' . $filename;
-               $this->mod_name = 'feed_mod_' . $filename;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $location, $name, $type ) {
+               $this->name     = 'feed_' . $name;
+               $this->mod_name = 'feed_mod_' . $name;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $lifetime = $this->lifetime;
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,21 +65,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param int    $lifetime Cache duration in seconds. Default is 43200 seconds (12 hours).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param string $filename Unique identifier for the cache object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @param string $name     Unique identifier for the cache object.
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $name );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Sets the transient.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Saves data to the transient.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param SimplePie $data Data to save.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param array|SimplePie\SimplePie $data Data to save. If passed a SimplePie object,
+        *                                        only cache the `$data` property.
</ins><span class="cx" style="display: block; padding: 0 10px">          * @return true Always true.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function save( $data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $data instanceof SimplePie ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $data instanceof SimplePie\SimplePie ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $data = $data->data;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,11 +90,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Gets the transient.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Retrieves the data saved in the transient.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @return mixed Transient value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @return array Data for `SimplePie::$data`.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        public function load() {
</span><span class="cx" style="display: block; padding: 0 10px">                return get_transient( $this->name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @return mixed Transient value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @return int Timestamp.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        public function mtime() {
</span><span class="cx" style="display: block; padding: 0 10px">                return get_transient( $this->mod_name );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpfeedcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-feed-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-feed-cache.php     2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/class-wp-feed-cache.php       2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +21,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> #[AllowDynamicProperties]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class WP_Feed_Cache extends SimplePie_Cache {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WP_Feed_Cache extends SimplePie\Cache {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Creates a new SimplePie_Cache object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Creates a new SimplePie\Cache object.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsimplepiefilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-simplepie-file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-simplepie-file.php 2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/class-wp-simplepie-file.php   2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> #[AllowDynamicProperties]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class WP_SimplePie_File extends SimplePie_File {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WP_SimplePie_File extends SimplePie\File {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Timeout.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->headers   = $headers;
</span><span class="cx" style="display: block; padding: 0 10px">                $this->useragent = $useragent;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->method = SimplePie\SimplePie::FILE_SOURCE_REMOTE;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( preg_match( '/^http(s)?:\/\//i', $url ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $args['headers'] = $this->headers;
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( SIMPLEPIE_USERAGENT !== $this->useragent ) { // Use default WP user agent unless custom has been specified.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( SimplePie\Misc::get_default_useragent() !== $this->useragent ) { // Use default WP user agent unless custom has been specified.
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $args['user-agent'] = $this->useragent;
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                 * The only exception to that is the `content-type` header, which should ignore
</span><span class="cx" style="display: block; padding: 0 10px">                                 * any previous values and only use the last one.
</span><span class="cx" style="display: block; padding: 0 10px">                                 *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                 * @see SimplePie_HTTP_Parser::new_line().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                          * @see SimplePie\HTTP\Parser::new_line().
</ins><span class="cx" style="display: block; padding: 0 10px">                                  */
</span><span class="cx" style="display: block; padding: 0 10px">                                foreach ( $this->headers as $name => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( ! is_array( $value ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsimplepiesanitizeksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php        2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php  2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,13 +10,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Core class used to implement SimplePie feed sanitization.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Extends the SimplePie_Sanitize class to use KSES, because
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Extends the SimplePie\Sanitize class to use KSES, because
</ins><span class="cx" style="display: block; padding: 0 10px">  * we cannot universally count on DOMDocument being available.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> #[AllowDynamicProperties]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WP_SimplePie_Sanitize_KSES extends SimplePie\Sanitize {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * WordPress SimplePie sanitization using KSES.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,17 +33,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function sanitize( $data, $type, $base = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $data = trim( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $type & SimplePie\SimplePie::CONSTRUCT_MAYBE_HTML ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( preg_match( '/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $type |= SIMPLEPIE_CONSTRUCT_HTML;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $type |= SimplePie\SimplePie::CONSTRUCT_HTML;
</ins><span class="cx" style="display: block; padding: 0 10px">                         } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $type |= SIMPLEPIE_CONSTRUCT_TEXT;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $type |= SimplePie\SimplePie::CONSTRUCT_TEXT;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $type & SIMPLEPIE_CONSTRUCT_BASE64 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $type & SimplePie\SimplePie::CONSTRUCT_BASE64 ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $data = base64_decode( $data );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $type & ( SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $type & ( SimplePie\SimplePie::CONSTRUCT_HTML | \SimplePie\SimplePie::CONSTRUCT_XHTML ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $data = wp_kses_post( $data );
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'UTF-8' !== $this->output_encoding ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $data = $this->registry->call( 'Misc', 'change_encoding', array( $data, 'UTF-8', $this->output_encoding ) );
</span></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php    2024-09-30 22:31:35 UTC (rev 59140)
+++ trunk/src/wp-includes/feed.php      2024-09-30 22:48:16 UTC (rev 59141)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -791,10 +791,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param string|string[] $url URL of feed to retrieve. If an array of URLs, the feeds are merged
</span><span class="cx" style="display: block; padding: 0 10px">  *                             using SimplePie's multifeed feature.
</span><span class="cx" style="display: block; padding: 0 10px">  *                             See also {@link http://simplepie.org/wiki/faq/typical_multifeed_gotchas}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return SimplePie|WP_Error SimplePie object on success or WP_Error object on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return SimplePie\SimplePie|WP_Error SimplePie object on success or WP_Error object on failure.
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function fetch_feed( $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( ! class_exists( 'SimplePie', false ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! class_exists( 'SimplePie\SimplePie', false ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 require_once ABSPATH . WPINC . '/class-simplepie.php';
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,7 +802,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        require_once ABSPATH . WPINC . '/class-wp-simplepie-file.php';
</span><span class="cx" style="display: block; padding: 0 10px">        require_once ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $feed = new SimplePie();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $feed = new SimplePie\SimplePie();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $feed->set_sanitize_class( 'WP_SimplePie_Sanitize_KSES' );
</span><span class="cx" style="display: block; padding: 0 10px">        /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -832,8 +832,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param SimplePie       $feed SimplePie feed object (passed by reference).
-        * @param string|string[] $url  URL of feed or array of URLs of feeds to retrieve.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param SimplePie\SimplePie $feed SimplePie feed object (passed by reference).
+        * @param string|string[]     $url  URL of feed or array of URLs of feeds to retrieve.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>