<!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>[38354] trunk/src/wp-includes: Feed: move 'WP_Feed_Cache', 'WP_Feed_Cache_Transient', `WP_SimplePie_File` and `WP_SimplePie_Sanitize_KSES` into their own files via `svn cp`.</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 { 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/38354">38354</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/38354","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-25 18:18:01 +0000 (Thu, 25 Aug 2016)</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'>Feed: move 'WP_Feed_Cache', 'WP_Feed_Cache_Transient', `WP_SimplePie_File` and `WP_SimplePie_Sanitize_KSES` into their own files via `svn cp`. If we move forard with autoloading, `class-feed.php` is useless. We could even remove it now, and just load these new files in `wp-settings.php`. That can be decided post-mortem. `class-feed.php` is an interesting name: there is no `Feed` or `WP_Feed` class.
See <a href="https://core.trac.wordpress.org/ticket/37827">#37827</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclassfeedphp">trunk/src/wp-includes/class-feed.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2016-08-25 17:43:41 UTC (rev 38353)
+++ trunk/src/wp-includes/class-feed.php 2016-08-25 18:18:01 UTC (rev 38354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,277 +1,15 @@
</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 ) )
- require_once( ABSPATH . WPINC . '/class-simplepie.php' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Core class used to implement a feed cache.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Feed API
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.8.0
- *
- * @see SimplePie_Cache
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @package WordPress
+ * @subpackage Feed
</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 WP_Feed_Cache extends SimplePie_Cache {
-
- /**
- * Creates a new SimplePie_Cache object.
- *
- * @since 2.8.0
- * @access public
- *
- * @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 WP_Feed_Cache_Transient Feed cache handler object that uses transients.
- */
- public function create($location, $filename, $extension) {
- return new WP_Feed_Cache_Transient($location, $filename, $extension);
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! class_exists( 'SimplePie', false ) ) {
+ require_once( ABSPATH . WPINC . '/class-simplepie.php' );
</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">-/**
- * Core class used to implement feed cache transients.
- *
- * @since 2.8.0
- */
-class WP_Feed_Cache_Transient {
-
- /**
- * Holds the transient name.
- *
- * @since 2.8.0
- * @access public
- * @var string
- */
- public $name;
-
- /**
- * Holds the transient mod name.
- *
- * @since 2.8.0
- * @access public
- * @var string
- */
- public $mod_name;
-
- /**
- * Holds the cache duration in seconds.
- *
- * Defaults to 43200 seconds (12 hours).
- *
- * @since 2.8.0
- * @access public
- * @var int
- */
- public $lifetime = 43200;
-
- /**
- * Constructor.
- *
- * @since 2.8.0
- * @since 3.2.0 Updated to use a PHP5 constructor.
- * @access public
- *
- * @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'.
- */
- public function __construct($location, $filename, $extension) {
- $this->name = 'feed_' . $filename;
- $this->mod_name = 'feed_mod_' . $filename;
-
- $lifetime = $this->lifetime;
- /**
- * Filters the transient lifetime of the feed cache.
- *
- * @since 2.8.0
- *
- * @param int $lifetime Cache duration in seconds. Default is 43200 seconds (12 hours).
- * @param string $filename Unique identifier for the cache object.
- */
- $this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename);
- }
-
- /**
- * Sets the transient.
- *
- * @since 2.8.0
- * @access public
- *
- * @param SimplePie $data Data to save.
- * @return true Always true.
- */
- public function save($data) {
- if ( $data instanceof SimplePie ) {
- $data = $data->data;
- }
-
- set_transient($this->name, $data, $this->lifetime);
- set_transient($this->mod_name, time(), $this->lifetime);
- return true;
- }
-
- /**
- * Gets the transient.
- *
- * @since 2.8.0
- * @access public
- *
- * @return mixed Transient value.
- */
- public function load() {
- return get_transient($this->name);
- }
-
- /**
- * Gets mod transient.
- *
- * @since 2.8.0
- * @access public
- *
- * @return mixed Transient value.
- */
- public function mtime() {
- return get_transient($this->mod_name);
- }
-
- /**
- * Sets mod transient.
- *
- * @since 2.8.0
- * @access public
- *
- * @return bool False if value was not set and true if value was set.
- */
- public function touch() {
- return set_transient($this->mod_name, time(), $this->lifetime);
- }
-
- /**
- * Deletes transients.
- *
- * @since 2.8.0
- * @access public
- *
- * @return true Always true.
- */
- public function unlink() {
- delete_transient($this->name);
- delete_transient($this->mod_name);
- return true;
- }
-}
-
-/**
- * Core class for fetching remote files and reading local files with SimplePie.
- *
- * @since 2.8.0
- *
- * @see SimplePie_File
- */
-class WP_SimplePie_File extends SimplePie_File {
-
- /**
- * Constructor.
- *
- * @since 2.8.0
- * @since 3.2.0 Updated to use a PHP5 constructor.
- * @access public
- *
- * @param string $url Remote file URL.
- * @param integer $timeout Optional. How long the connection should stay open in seconds.
- * Default 10.
- * @param integer $redirects Optional. The number of allowed redirects. Default 5.
- * @param string|array $headers Optional. Array or string of headers to send with the request.
- * Default null.
- * @param string $useragent Optional. User-agent value sent. Default null.
- * @param boolean $force_fsockopen Optional. Whether to force opening internet or unix domain socket
- * connection or not. Default false.
- */
- public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
- $this->url = $url;
- $this->timeout = $timeout;
- $this->redirects = $redirects;
- $this->headers = $headers;
- $this->useragent = $useragent;
-
- $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
-
- if ( preg_match('/^http(s)?:\/\//i', $url) ) {
- $args = array(
- 'timeout' => $this->timeout,
- 'redirection' => $this->redirects,
- );
-
- if ( !empty($this->headers) )
- $args['headers'] = $this->headers;
-
- if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
- $args['user-agent'] = $this->useragent;
-
- $res = wp_safe_remote_request($url, $args);
-
- if ( is_wp_error($res) ) {
- $this->error = 'WP HTTP Error: ' . $res->get_error_message();
- $this->success = false;
- } else {
- $this->headers = wp_remote_retrieve_headers( $res );
- $this->body = wp_remote_retrieve_body( $res );
- $this->status_code = wp_remote_retrieve_response_code( $res );
- }
- } else {
- $this->error = '';
- $this->success = false;
- }
- }
-}
-
-/**
- * Core class used to implement SimpliePie feed sanitization.
- *
- * Extends the SimplePie_Sanitize class to use KSES, because
- * we cannot universally count on DOMDocument being available.
- *
- * @since 3.5.0
- *
- * @see SimplePie_Sanitize
- */
-class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
-
- /**
- * WordPress SimplePie sanitization using KSES.
- *
- * Sanitizes the incoming data, to ensure that it matches the type of data expected, using KSES.
- *
- * @since 3.5.0
- * @access public
- *
- * @param mixed $data The data that needs to be sanitized.
- * @param integer $type The type of data that it's supposed to be.
- * @param string $base Optional. The `xml:base` value to use when converting relative
- * URLs to absolute ones. Default empty.
- * @return mixed Sanitized data.
- */
- public function sanitize( $data, $type, $base = '' ) {
- $data = trim( $data );
- 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 ) ) {
- $data = wp_kses_post( $data );
- if ( $this->output_encoding !== 'UTF-8' ) {
- $data = $this->registry->call( 'Misc', 'change_encoding', array( $data, 'UTF-8', $this->output_encoding ) );
- }
- return $data;
- } else {
- return parent::sanitize( $data, $type, $base );
- }
- }
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once( ABSPATH . WPINC . '/class-wp-feed-cache.php' );
+require_once( ABSPATH . WPINC . '/class-wp-feed-cache-transient.php' );
+require_once( ABSPATH . WPINC . '/class-wp-simplepie-file.php' );
+require_once( ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpfeedcachetransientphpfromrev38350trunksrcwpincludesclassfeedphp"></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/class-wp-feed-cache-transient.php (from rev 38350, 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-wp-feed-cache-transient.php (rev 0)
+++ trunk/src/wp-includes/class-wp-feed-cache-transient.php 2016-08-25 18:18:01 UTC (rev 38354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,141 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Feed API: WP_Feed_Cache_Transient class
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 4.7.0
+ */
+
+/**
+ * Core class used to implement feed cache transients.
+ *
+ * @since 2.8.0
+ */
+class WP_Feed_Cache_Transient {
+
+ /**
+ * Holds the transient name.
+ *
+ * @since 2.8.0
+ * @access public
+ * @var string
+ */
+ public $name;
+
+ /**
+ * Holds the transient mod name.
+ *
+ * @since 2.8.0
+ * @access public
+ * @var string
+ */
+ public $mod_name;
+
+ /**
+ * Holds the cache duration in seconds.
+ *
+ * Defaults to 43200 seconds (12 hours).
+ *
+ * @since 2.8.0
+ * @access public
+ * @var int
+ */
+ public $lifetime = 43200;
+
+ /**
+ * Constructor.
+ *
+ * @since 2.8.0
+ * @since 3.2.0 Updated to use a PHP5 constructor.
+ * @access public
+ *
+ * @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'.
+ */
+ public function __construct($location, $filename, $extension) {
+ $this->name = 'feed_' . $filename;
+ $this->mod_name = 'feed_mod_' . $filename;
+
+ $lifetime = $this->lifetime;
+ /**
+ * Filters the transient lifetime of the feed cache.
+ *
+ * @since 2.8.0
+ *
+ * @param int $lifetime Cache duration in seconds. Default is 43200 seconds (12 hours).
+ * @param string $filename Unique identifier for the cache object.
+ */
+ $this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename);
+ }
+
+ /**
+ * Sets the transient.
+ *
+ * @since 2.8.0
+ * @access public
+ *
+ * @param SimplePie $data Data to save.
+ * @return true Always true.
+ */
+ public function save($data) {
+ if ( $data instanceof SimplePie ) {
+ $data = $data->data;
+ }
+
+ set_transient($this->name, $data, $this->lifetime);
+ set_transient($this->mod_name, time(), $this->lifetime);
+ return true;
+ }
+
+ /**
+ * Gets the transient.
+ *
+ * @since 2.8.0
+ * @access public
+ *
+ * @return mixed Transient value.
+ */
+ public function load() {
+ return get_transient($this->name);
+ }
+
+ /**
+ * Gets mod transient.
+ *
+ * @since 2.8.0
+ * @access public
+ *
+ * @return mixed Transient value.
+ */
+ public function mtime() {
+ return get_transient($this->mod_name);
+ }
+
+ /**
+ * Sets mod transient.
+ *
+ * @since 2.8.0
+ * @access public
+ *
+ * @return bool False if value was not set and true if value was set.
+ */
+ public function touch() {
+ return set_transient($this->mod_name, time(), $this->lifetime);
+ }
+
+ /**
+ * Deletes transients.
+ *
+ * @since 2.8.0
+ * @access public
+ *
+ * @return true Always true.
+ */
+ public function unlink() {
+ delete_transient($this->name);
+ delete_transient($this->mod_name);
+ return true;
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesclasswpfeedcachephpfromrev38350trunksrcwpincludesclassfeedphp"></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/class-wp-feed-cache.php (from rev 38350, 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-wp-feed-cache.php (rev 0)
+++ trunk/src/wp-includes/class-wp-feed-cache.php 2016-08-25 18:18:01 UTC (rev 38354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,33 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Feed API: WP_Feed_Cache class
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 4.7.0
+ */
+
+/**
+ * Core class used to implement a feed cache.
+ *
+ * @since 2.8.0
+ *
+ * @see SimplePie_Cache
+ */
+class WP_Feed_Cache extends SimplePie_Cache {
+
+ /**
+ * Creates a new SimplePie_Cache object.
+ *
+ * @since 2.8.0
+ * @access public
+ *
+ * @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 WP_Feed_Cache_Transient Feed cache handler object that uses transients.
+ */
+ public function create($location, $filename, $extension) {
+ return new WP_Feed_Cache_Transient($location, $filename, $extension);
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesclasswpsimplepiefilephpfromrev38350trunksrcwpincludesclassfeedphp"></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/class-wp-simplepie-file.php (from rev 38350, 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-wp-simplepie-file.php (rev 0)
+++ trunk/src/wp-includes/class-wp-simplepie-file.php 2016-08-25 18:18:01 UTC (rev 38354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,72 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Feed API: WP_SimplePie_File class
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 4.7.0
+ */
+
+/**
+ * Core class for fetching remote files and reading local files with SimplePie.
+ *
+ * @since 2.8.0
+ *
+ * @see SimplePie_File
+ */
+class WP_SimplePie_File extends SimplePie_File {
+
+ /**
+ * Constructor.
+ *
+ * @since 2.8.0
+ * @since 3.2.0 Updated to use a PHP5 constructor.
+ * @access public
+ *
+ * @param string $url Remote file URL.
+ * @param integer $timeout Optional. How long the connection should stay open in seconds.
+ * Default 10.
+ * @param integer $redirects Optional. The number of allowed redirects. Default 5.
+ * @param string|array $headers Optional. Array or string of headers to send with the request.
+ * Default null.
+ * @param string $useragent Optional. User-agent value sent. Default null.
+ * @param boolean $force_fsockopen Optional. Whether to force opening internet or unix domain socket
+ * connection or not. Default false.
+ */
+ public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
+ $this->url = $url;
+ $this->timeout = $timeout;
+ $this->redirects = $redirects;
+ $this->headers = $headers;
+ $this->useragent = $useragent;
+
+ $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
+
+ if ( preg_match('/^http(s)?:\/\//i', $url) ) {
+ $args = array(
+ 'timeout' => $this->timeout,
+ 'redirection' => $this->redirects,
+ );
+
+ if ( !empty($this->headers) )
+ $args['headers'] = $this->headers;
+
+ if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+ $args['user-agent'] = $this->useragent;
+
+ $res = wp_safe_remote_request($url, $args);
+
+ if ( is_wp_error($res) ) {
+ $this->error = 'WP HTTP Error: ' . $res->get_error_message();
+ $this->success = false;
+ } else {
+ $this->headers = wp_remote_retrieve_headers( $res );
+ $this->body = wp_remote_retrieve_body( $res );
+ $this->status_code = wp_remote_retrieve_response_code( $res );
+ }
+ } else {
+ $this->error = '';
+ $this->success = false;
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesclasswpsimplepiesanitizeksesphpfromrev38350trunksrcwpincludesclassfeedphp"></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/class-wp-simplepie-sanitize-kses.php (from rev 38350, 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-wp-simplepie-sanitize-kses.php (rev 0)
+++ trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php 2016-08-25 18:18:01 UTC (rev 38354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,59 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Feed API: WP_SimplePie_Sanitize_KSES class
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 4.7.0
+ */
+
+/**
+ * Core class used to implement SimpliePie feed sanitization.
+ *
+ * Extends the SimplePie_Sanitize class to use KSES, because
+ * we cannot universally count on DOMDocument being available.
+ *
+ * @since 3.5.0
+ *
+ * @see SimplePie_Sanitize
+ */
+class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
+
+ /**
+ * WordPress SimplePie sanitization using KSES.
+ *
+ * Sanitizes the incoming data, to ensure that it matches the type of data expected, using KSES.
+ *
+ * @since 3.5.0
+ * @access public
+ *
+ * @param mixed $data The data that needs to be sanitized.
+ * @param integer $type The type of data that it's supposed to be.
+ * @param string $base Optional. The `xml:base` value to use when converting relative
+ * URLs to absolute ones. Default empty.
+ * @return mixed Sanitized data.
+ */
+ public function sanitize( $data, $type, $base = '' ) {
+ $data = trim( $data );
+ 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 ) ) {
+ $data = wp_kses_post( $data );
+ if ( $this->output_encoding !== 'UTF-8' ) {
+ $data = $this->registry->call( 'Misc', 'change_encoding', array( $data, 'UTF-8', $this->output_encoding ) );
+ }
+ return $data;
+ } else {
+ return parent::sanitize( $data, $type, $base );
+ }
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>