<!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>[47018] trunk: Bootstrap/Load: Make handling the `/favicon.ico` requests more flexible.</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/47018">47018</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/47018","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>2019-12-28 21:18:03 +0000 (Sat, 28 Dec 2019)</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'>Bootstrap/Load: Make handling the `/favicon.ico` requests more flexible.
Previously, `wp_favicon_request()` was introduced in <a href="https://core.trac.wordpress.org/changeset/13205">[13205]</a> to avoid a performance hit of serving a full 404 page on every favicon request.
While working as intended, that implementation did not provide a way for theme or plugin authors to manage the behavior of favicon requests.
This changeset implements the following logic (only applied if WordPress is installed in the root directory):
* If there is a Site Icon set in Customizer, redirect `/favicon.ico` requests to that icon.
* Otherwise, use the WordPress logo as a default icon.
* If a physical `/favicon.ico` file exists, do nothing, let the server handle the request.
Handling `/favicon.ico` is now more consistent with handling `/robots.txt` requests.
New functions and hooks:
* Introduce `is_favicon()` conditional tag to complement `is_robots()`.
* Introduce `do_favicon` action to complement `do_robots` and use it in template loader.
* Introduce `do_favicon()` function, hooked to the above action by default, to complement `do_robots()`.
* Introduce `do_faviconico` action to complement `do_robotstxt`, for plugins to override the default behavior.
* Mark `wp_favicon_request()` as deprecated in favor of `do_favicon()`.
Props jonoaldersonwp, birgire, joostdevalk, mukesh27, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/47398">#47398</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswprewritephp">trunk/src/wp-includes/class-wp-rewrite.php</a></li>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunksrcwpincludestemplateloaderphp">trunk/src/wp-includes/template-loader.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#trunktestsphpunittestsqueryvarsphp">trunk/tests/phpunit/tests/query/vars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescanonicalphp"></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/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/canonical.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Prevents redirection for feeds, trackbacks, searches, and
</span><span class="cx" style="display: block; padding: 0 10px"> * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7+,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
- * requests.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * page/post previews, WP admin, Trackbacks, robots.txt, favicon.ico, searches,
+ * or on POST requests.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Will also attempt to find the correct link when a user enters a URL that does
</span><span class="cx" style="display: block; padding: 0 10px"> * not exist based on exact WordPress query. Will instead try to parse the URL
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</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">- if ( is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ( $is_IIS && ! iis7_supports_permalinks() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || is_favicon() || ( $is_IIS && ! iis7_supports_permalinks() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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="trunksrcwpincludesclasswpqueryphp"></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-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/class-wp-query.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,6 +391,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $is_robots = 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">+ * Signifies whether the current query is for the favicon.ico file.
+ *
+ * @since 5.4.0
+ * @var bool
+ */
+ public $is_favicon = false;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Signifies whether the current query is for the page_for_posts page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Basically, the homepage if the option isn't set for the static homepage.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,6 +486,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_attachment = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_singular = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_robots = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_favicon = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_posts_page = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_post_type_archive = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -744,6 +753,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $qv['robots'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_robots = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $qv['favicon'] ) ) {
+ $this->is_favicon = true;
</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"> if ( ! is_scalar( $qv['p'] ) || $qv['p'] < 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,7 +968,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_comment_feed = true;
</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 ( ! ( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed
+ || ( defined( 'REST_REQUEST' ) && REST_REQUEST )
+ || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots || $this->is_favicon ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_home = true;
</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">@@ -4007,7 +4020,7 @@
</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">- * Is the query for the robots file?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Is the query for the robots.txt file?
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4018,6 +4031,17 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Is the query for the favicon.ico file?
+ *
+ * @since 5.4.0
+ *
+ * @return bool
+ */
+ public function is_favicon() {
+ return (bool) $this->is_favicon;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Is the query for a search?
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span></span></pre></div>
<a id="trunksrcwpincludesclasswprewritephp"></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-rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-rewrite.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1259,10 +1259,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $rewrite;
</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">- // robots.txt -only if installed at the root
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // robots.txt -- only if installed at the root
</ins><span class="cx" style="display: block; padding: 0 10px"> $home_path = parse_url( home_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // favicon.ico -- only if installed at the root
+ $favicon_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'favicon\.ico$' => $this->index . '?favicon=1' ) : array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Old feed and service files.
</span><span class="cx" style="display: block; padding: 0 10px"> $deprecated_files = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index . '?feed=old',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1419,9 +1422,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Put them together.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->use_verbose_page_rules ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->rules = array_merge( $this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->rules = array_merge( $this->extra_rules_top, $robots_rewrite, $favicon_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules );
</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">- $this->rules = array_merge( $this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->rules = array_merge( $this->extra_rules_top, $robots_rewrite, $favicon_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules );
</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></span></pre></div>
<a id="trunksrcwpincludesclasswpphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/class-wp.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string[]
</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 $public_query_vars = array( 'm', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $public_query_vars = array( 'm', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'favicon', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
</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"> * Private query variables.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -659,8 +659,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- // Never 404 for the admin, robots, or if we found posts.
- if ( is_admin() || is_robots() || $wp_query->posts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Never 404 for the admin, robots, favicon, or if we found posts.
+ if ( is_admin() || is_robots() || is_favicon() || $wp_query->posts ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $success = true;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() ) {
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/default-filters.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,6 +338,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'do_feed_atom', 'do_feed_atom', 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'do_pings', 'do_all_pings', 10, 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'do_robots', 'do_robots' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'do_favicon', 'do_favicon' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'set_comment_cookies', 'wp_set_comment_cookies', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'sanitize_comment_cookies', 'sanitize_comment_cookies' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_print_scripts', 'print_emoji_detection_script' );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/functions.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1637,6 +1637,23 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Display the favicon.ico file content.
+ *
+ * @since 5.4.0
+ */
+function do_favicon() {
+ /**
+ * Fires when serving the favicon.ico file.
+ *
+ * @since 5.4.0
+ */
+ do_action( 'do_faviconico' );
+
+ wp_redirect( get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) ) );
+ exit;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Determines whether WordPress is already installed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The cache will be checked first. If you have a cache plugin, which saves
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/load.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,6 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Instead, send the headers for a zero-length favicon and bail.
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 5.4.0 Deprecated in favor of do_favicon().
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_favicon_request() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/query.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,7 +623,7 @@
</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">- * Is the query for the robots file?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Is the query for the robots.txt file?
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -643,6 +643,26 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Is the query for the favicon.ico file?
+ *
+ * @since 5.4.0
+ *
+ * @global WP_Query $wp_query WordPress Query object.
+ *
+ * @return bool
+ */
+function is_favicon() {
+ global $wp_query;
+
+ if ( ! isset( $wp_query ) ) {
+ _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1.0' );
+ return false;
+ }
+
+ return $wp_query->is_favicon();
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Determines whether the query is for a search.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * For more information on this and similar theme functions, check out
</span></span></pre></div>
<a id="trunksrcwpincludestemplateloaderphp"></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/template-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template-loader.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/template-loader.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,6 +36,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'do_robots' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( is_favicon() ) {
+ /**
+ * Fired when the template loader determines a favicon.ico request.
+ *
+ * @since 5.4.0
+ */
+ do_action( 'do_favicon' );
+ return;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_feed() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> do_feed();
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></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/version.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/version.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-includes/version.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $wp_db_version
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wp_db_version = 45805;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$wp_db_version = 47018;
</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 TinyMCE version
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/src/wp-settings.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,9 +63,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Standardize $_SERVER variables across setups.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_fix_server_vars();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Check if we have received a request due to missing favicon.ico
-wp_favicon_request();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Check if we're in maintenance mode.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_maintenance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -962,6 +962,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_posts_page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_preview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_robots',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'is_favicon',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'is_search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_single',
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_singular',
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryvarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/vars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/vars.php 2019-12-27 00:28:39 UTC (rev 47017)
+++ trunk/tests/phpunit/tests/query/vars.php 2019-12-28 21:18:03 UTC (rev 47018)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'subpost_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'preview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'robots',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'favicon',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'term',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cpage',
</span></span></pre>
</div>
</div>
</body>
</html>