<!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>[49992] trunk: Robots: Introduce Robots API.</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/49992">49992</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/49992","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-01-21 01:35:16 +0000 (Thu, 21 Jan 2021)</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'>Robots: Introduce Robots API.
This changeset introduces a filter-based Robots API, providing central control over the `robots` meta tag.
* Introduces `wp_robots()` function which should be called anywhere a `robots` meta tag should be included.
* Introduces `wp_robots` filter which allows adding or modifying directives for the `robots` meta tag. The `wp_robots()` function is entirely filter-based, i.e. if no filter is added to `wp_robots`, no directives will be present, and therefore the entire `robots` meta tag will be omitted.
* Introduces the following `wp_robots` filter functions which replace similar existing functions that were manually rendering a `robots` meta tag:
* `wp_robots_noindex()` replaces `noindex()`, which has been deprecated.
* `wp_robots_no_robots()` replaces `wp_no_robots()`, which has been deprecated.
* `wp_robots_sensitive_page()` replaces `wp_sensitive_page_meta()`, which has been deprecated. Its rendering of the `referrer` meta tag has been moved to another new function `wp_strict_cross_origin_referrer()`.
Migration to the new functions is straightforward. For example, a call to `add_action( 'wp_head', 'wp_no_robots' )` should be replaced with `add_filter( 'wp_robots', 'wp_robots_no_robots' )`.
Plugins and themes that render their own `robots` meta tags are encouraged to switch to rely on the `wp_robots` filter in order to use the central management layer now provided by WordPress core.
Props adamsilverstein, flixos90, timothyblynjacobs, westonruter.
See <a href="https://core.trac.wordpress.org/ticket/51511">#51511</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpactivatephp">trunk/src/wp-activate.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrobotstemplatephp">trunk/src/wp-includes/robots-template.php</a></li>
<li><a href="#trunktestsphpunittestsrobotsphp">trunk/tests/phpunit/tests/robots.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpactivatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-activate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-activate.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-activate.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,8 @@
</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"> add_action( 'wp_head', 'wpmu_activate_stylesheet' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_head', 'wp_sensitive_page_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wp_head', 'wp_strict_cross_origin_referrer' );
+add_filter( 'wp_robots', 'wp_robots_sensitive_page' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_header( 'wp-activate' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1900,7 +1900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> nocache_headers();
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'X-Robots: noindex, nofollow, noarchive' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wp_head', 'wp_no_robots' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_robots', 'wp_robots_no_robots' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_headers', array( $this, 'filter_iframe_security_headers' ) );
</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="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 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-includes/default-filters.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,6 +231,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Email filters.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Robots filters.
+add_filter( 'wp_robots', 'wp_robots_noindex' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Mark site as no longer fresh.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'publish_post', 'publish_page', 'wp_ajax_save-widget', 'wp_ajax_widgets-order', 'customize_save_after' ) as $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( $action, '_delete_option_fresh_site', 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wlwmanifest_link' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'locale_stylesheet' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'publish_future_post', 'check_and_publish_future_post', 10, 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_head', 'noindex', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wp_head', 'wp_robots', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'print_emoji_detection_script', 7 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_print_styles', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_print_head_scripts', 9 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,10 +314,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_print_styles', 'print_emoji_styles' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['replytocom'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wp_head', 'wp_no_robots' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_robots', 'wp_robots_no_robots' );
</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"> // Login actions.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'login_head', 'wp_robots', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'login_head', 'wp_resource_hints', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_head', 'wp_print_head_scripts', 9 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_head', 'print_admin_styles', 9 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,7 +589,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_head', 'print_embed_styles' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_head', 'wp_print_head_scripts', 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_head', 'wp_print_styles', 20 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'embed_head', 'wp_no_robots' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'embed_head', 'wp_robots' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_head', 'rel_canonical' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_head', 'locale_stylesheet', 30 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,6 +600,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_footer', 'print_embed_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'embed_footer', 'wp_print_footer_scripts', 20 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'wp_robots', 'wp_embed_no_robots' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'excerpt_more', 'wp_embed_excerpt_more', 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_embed', 'wptexturize' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_embed', 'convert_chars' );
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-includes/deprecated.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4135,3 +4135,71 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function addslashes_strings_only( $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return is_string( $value ) ? addslashes( $value ) : $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Displays a noindex meta tag if required by the blog configuration.
+ *
+ * If a blog is marked as not being public then the noindex meta tag will be
+ * output to tell web robots not to index the page content. Add this to the
+ * {@see 'wp_head'} action.
+ *
+ * Typical usage is as a {@see 'wp_head'} callback:
+ *
+ * add_action( 'wp_head', 'noindex' );
+ *
+ * @see wp_no_robots()
+ *
+ * @since 2.1.0
+ * @deprecated 5.7.0 Use wp_robots_noindex() instead on 'wp_robots' filter.
+ */
+function noindex() {
+ _deprecated_function( __FUNCTION__, '5.7.0', 'wp_robots_noindex()' );
+
+ // If the blog is not public, tell robots to go away.
+ if ( '0' == get_option( 'blog_public' ) ) {
+ wp_no_robots();
+ }
+}
+
+/**
+ * Display a noindex meta tag.
+ *
+ * Outputs a noindex meta tag that tells web robots not to index the page content.
+ * Typical usage is as a {@see 'wp_head'} callback. add_action( 'wp_head', 'wp_no_robots' );
+ *
+ * @since 3.3.0
+ * @since 5.3.0 Echo "noindex,nofollow" if search engine visibility is discouraged.
+ * @deprecated 5.7.0 Use wp_robots_no_robots() instead on 'wp_robots' filter.
+ */
+function wp_no_robots() {
+ _deprecated_function( __FUNCTION__, '5.7.0', 'wp_robots_no_robots()' );
+
+ if ( get_option( 'blog_public' ) ) {
+ echo "<meta name='robots' content='noindex,follow' />\n";
+ return;
+ }
+
+ echo "<meta name='robots' content='noindex,nofollow' />\n";
+}
+
+/**
+ * Display a noindex,noarchive meta tag and referrer origin-when-cross-origin meta tag.
+ *
+ * Outputs a noindex,noarchive meta tag that tells web robots not to index or cache the page content.
+ * Outputs a referrer origin-when-cross-origin meta tag that tells the browser not to send the full
+ * url as a referrer to other sites when cross-origin assets are loaded.
+ *
+ * Typical usage is as a wp_head callback. add_action( 'wp_head', 'wp_sensitive_page_meta' );
+ *
+ * @since 5.0.1
+ * @deprecated 5.7.0 Use wp_robots_sensitive_page() instead on 'wp_robots' filter
+ * and wp_strict_cross_origin_referrer() on 'wp_head' action.
+ */
+function wp_sensitive_page_meta() {
+ _deprecated_function( __FUNCTION__, '5.7.0', 'wp_robots_sensitive_page()' );
+
+ ?>
+ <meta name='robots' content='noindex,noarchive' />
+ <?php
+ wp_strict_cross_origin_referrer();
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesembedphp"></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/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-includes/embed.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,3 +1243,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Adds noindex to the robots meta tag for embeds.
+ *
+ * Typical usage is as a {@see 'wp_robots'} callback:
+ *
+ * add_filter( 'wp_robots', 'wp_embed_no_robots' );
+ *
+ * @since 5.7.0
+ *
+ * @param array $robots Associative array of robots directives.
+ * @return array Filtered robots directives.
+ */
+function wp_embed_no_robots( array $robots ) {
+ if ( ! is_embed() ) {
+ return $robots;
+ }
+
+ return wp_robots_no_robots( $robots );
+}
</ins></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 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-includes/functions.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1640,7 +1640,8 @@
</span><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"> * @since 5.3.0 Remove the "Disallow: /" output if search engine visiblity is
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * discouraged in favor of robots meta HTML tag in wp_no_robots().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * discouraged in favor of robots meta HTML tag via wp_robots_no_robots()
+ * filter callback.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function do_robots() {
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/plain; charset=utf-8' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3491,8 +3492,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $parsed_args['charset']; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <meta name="viewport" content="width=device-width">
</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 ( function_exists( 'wp_no_robots' ) ) {
- wp_no_robots();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( function_exists( 'wp_robots' ) && function_exists( 'wp_robots_no_robots' ) && function_exists( 'add_filter' ) ) {
+ add_filter( 'wp_robots', 'wp_robots_no_robots' );
+ wp_robots();
</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"> <title><?php echo $title; ?></title>
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></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/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-includes/general-template.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3191,59 +3191,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Displays a noindex meta tag if required by the blog configuration.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Displays a referrer strict-origin-when-cross-origin meta tag.
</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 a blog is marked as not being public then the noindex meta tag will be
- * output to tell web robots not to index the page content. Add this to the
- * {@see 'wp_head'} action.
- *
- * Typical usage is as a {@see 'wp_head'} callback:
- *
- * add_action( 'wp_head', 'noindex' );
- *
- * @see wp_no_robots()
- *
- * @since 2.1.0
- */
-function noindex() {
- // If the blog is not public, tell robots to go away.
- if ( '0' == get_option( 'blog_public' ) ) {
- wp_no_robots();
- }
-}
-
-/**
- * Display a noindex meta tag.
- *
- * Outputs a noindex meta tag that tells web robots not to index the page content.
- * Typical usage is as a {@see 'wp_head'} callback. add_action( 'wp_head', 'wp_no_robots' );
- *
- * @since 3.3.0
- * @since 5.3.0 Echo "noindex,nofollow" if search engine visibility is discouraged.
- */
-function wp_no_robots() {
- if ( get_option( 'blog_public' ) ) {
- echo "<meta name='robots' content='noindex,follow' />\n";
- return;
- }
-
- echo "<meta name='robots' content='noindex,nofollow' />\n";
-}
-
-/**
- * Display a noindex,noarchive meta tag and referrer origin-when-cross-origin meta tag.
- *
- * Outputs a noindex,noarchive meta tag that tells web robots not to index or cache the page content.
</del><span class="cx" style="display: block; padding: 0 10px"> * Outputs a referrer origin-when-cross-origin meta tag that tells the browser not to send the full
</span><span class="cx" style="display: block; padding: 0 10px"> * url as a referrer to other sites when cross-origin assets are loaded.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Typical usage is as a wp_head callback. add_action( 'wp_head', 'wp_sensitive_page_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Typical usage is as a wp_head callback. add_action( 'wp_head', 'wp_strict_cross_origin_referrer' );
</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 5.0.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.7.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">-function wp_sensitive_page_meta() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_strict_cross_origin_referrer() {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <meta name='robots' content='noindex,noarchive' />
</del><span class="cx" style="display: block; padding: 0 10px"> <meta name='referrer' content='strict-origin-when-cross-origin' />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrobotstemplatephp"></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/robots-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/robots-template.php (rev 0)
+++ trunk/src/wp-includes/robots-template.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,135 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Robots template functions.
+ *
+ * @package WordPress
+ * @subpackage Robots
+ * @since 5.7.0
+ */
+
+/**
+ * Displays the robots meta tag as necessary.
+ *
+ * Gathers robots directives to include for the current context, using the
+ * {@see 'wp_robots'} filter. The directives are then sanitized, and the
+ * robots meta tag is output if there is at least one relevant directive.
+ *
+ * @since 5.7.0
+ */
+function wp_robots() {
+ /**
+ * Filters the directives to be included in the 'robots' meta tag.
+ *
+ * The meta tag will only be included as necessary.
+ *
+ * @since 5.7.0
+ *
+ * @param array $robots Associative array of directives. Every key must be the name of the directive, and the
+ * corresponding value must either be a string to provide as value for the directive or a
+ * boolean `true` if it is a boolean directive, i.e. without a value.
+ */
+ $robots = apply_filters( 'wp_robots', array() );
+
+ // Don't allow mutually exclusive directives.
+ if ( ! empty( $robots['follow'] ) ) {
+ unset( $robots['nofollow'] );
+ }
+ if ( ! empty( $robots['nofollow'] ) ) {
+ unset( $robots['follow'] );
+ }
+ if ( ! empty( $robots['archive'] ) ) {
+ unset( $robots['noarchive'] );
+ }
+ if ( ! empty( $robots['noarchive'] ) ) {
+ unset( $robots['archive'] );
+ }
+
+ $robots_strings = array();
+ foreach ( $robots as $directive => $value ) {
+ if ( is_string( $value ) ) {
+ // If a string value, include it as value for the directive.
+ $robots_strings[] = "{$directive}:{$value}";
+ } elseif ( $value ) {
+ // Otherwise, include the directive if it is truthy.
+ $robots_strings[] = $directive;
+ }
+ }
+
+ if ( empty( $robots_strings ) ) {
+ return;
+ }
+
+ echo "<meta name='robots' content='" . esc_attr( implode( ', ', $robots_strings ) ) . "' />\n";
+}
+
+/**
+ * Adds noindex to the robots meta tag if required by the site configuration.
+ *
+ * If a blog is marked as not being public then noindex will be output to
+ * tell web robots not to index the page content. Add this to the
+ * {@see 'wp_robots'} filter.
+ *
+ * Typical usage is as a {@see 'wp_robots'} callback:
+ *
+ * add_filter( 'wp_robots', 'wp_robots_noindex' );
+ *
+ * @since 5.7.0
+ * @see wp_robots_no_robots()
+ *
+ * @param array $robots Associative array of robots directives.
+ * @return array Filtered robots directives.
+ */
+function wp_robots_noindex( array $robots ) {
+ if ( ! get_option( 'blog_public' ) ) {
+ return wp_robots_no_robots( $robots );
+ }
+
+ return $robots;
+}
+
+/**
+ * Adds noindex to the robots meta tag.
+ *
+ * This directive tells web robots not to index the page content.
+ *
+ * Typical usage is as a {@see 'wp_robots'} callback:
+ *
+ * add_filter( 'wp_robots', 'wp_robots_no_robots' );
+ *
+ * @since 5.7.0
+ *
+ * @param array $robots Associative array of robots directives.
+ * @return array Filtered robots directives.
+ */
+function wp_robots_no_robots( array $robots ) {
+ $robots['noindex'] = true;
+
+ if ( get_option( 'blog_public' ) ) {
+ $robots['follow'] = true;
+ } else {
+ $robots['nofollow'] = true;
+ }
+
+ return $robots;
+}
+
+/**
+ * Adds noindex and noarchive to the robots meta tag.
+ *
+ * This directive tells web robots not to index or archive the page content and
+ * is recommended to be used for sensitive pages.
+ *
+ * Typical usage is as a {@see 'wp_robots'} callback:
+ *
+ * add_filter( 'wp_robots', 'wp_robots_sensitive_page' );
+ *
+ * @since 5.7.0
+ *
+ * @param array $robots Associative array of robots directives.
+ * @return array Filtered robots directives.
+ */
+function wp_robots_sensitive_page( array $robots ) {
+ $robots['noindex'] = true;
+ $robots['noarchive'] = true;
+ return $robots;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/robots-template.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="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-login.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $error, $interim_login, $action;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't index any of these forms.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'login_head', 'wp_sensitive_page_meta' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_robots', 'wp_robots_sensitive_page' );
+ add_action( 'login_head', 'wp_strict_cross_origin_referrer' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_head', 'wp_login_viewport_meta' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-settings.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,6 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/general-template.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/link-template.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/author-template.php';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require ABSPATH . WPINC . '/robots-template.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/post.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/class-walker-page.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/class-walker-page-dropdown.php';
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/src/wp-signup.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Sets up the WordPress Environment. */
</span><span class="cx" style="display: block; padding: 0 10px"> require __DIR__ . '/wp-load.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">-add_action( 'wp_head', 'wp_no_robots' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'wp_robots', 'wp_robots_no_robots' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require __DIR__ . '/wp-blog-header.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/tests/phpunit/tests/customize/manager.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -893,7 +893,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->customize_preview_init();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $did_action_customize_preview_init + 1, did_action( 'customize_preview_init' ) );
</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->assertSame( 10, has_action( 'wp_head', 'wp_no_robots' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 10, has_filter( 'wp_robots', 'wp_robots_no_robots' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 10, has_action( 'wp_head', array( $wp_customize, 'remove_frameless_preview_messenger_channel' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 10, has_filter( 'wp_headers', array( $wp_customize, 'filter_iframe_security_headers' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 10, has_filter( 'wp_redirect', array( $wp_customize, 'add_state_query_params' ) ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneraltemplatephp"></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/general/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/template.php 2021-01-20 19:05:39 UTC (rev 49991)
+++ trunk/tests/phpunit/tests/general/template.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,21 +475,6 @@
</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">- * @ticket 43590
- */
- function test_wp_no_robots() {
- // Simulate private site (search engines discouraged).
- update_option( 'blog_public', '0' );
- $actual_private = get_echo( 'wp_no_robots' );
- $this->assertSame( "<meta name='robots' content='noindex,nofollow' />\n", $actual_private );
-
- // Simulate public site.
- update_option( 'blog_public', '1' );
- $actual_public = get_echo( 'wp_no_robots' );
- $this->assertSame( "<meta name='robots' content='noindex,follow' />\n", $actual_public );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40969
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_header_returns_nothing_on_success() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrobotsphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/robots.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/robots.php (rev 0)
+++ trunk/tests/phpunit/tests/robots.php 2021-01-21 01:35:16 UTC (rev 49992)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,213 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Robots functions tests.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Tests for robots template functions and filters.
+ *
+ * @group robots
+ */
+class Tests_Robots extends WP_UnitTestCase {
+
+ public function setUp() {
+ parent::setUp();
+
+ remove_all_filters( 'wp_robots' );
+ }
+
+ /**
+ * @ticket 51511
+ */
+ public function test_wp_robots_renders_when_relevant() {
+ // Do not render robots meta tag when there are no directives.
+ $output = get_echo( 'wp_robots' );
+ $this->assertEmpty( $output );
+
+ // Render robots meta tag with noindex.
+ add_filter( 'wp_robots', array( $this, 'add_noindex_directive' ) );
+ $output = get_echo( 'wp_robots' );
+ $this->assertEquals( "<meta name='robots' content='noindex' />\n", $output );
+
+ // Do not render robots meta tag when there are only false-y directives.
+ add_filter( 'wp_robots', array( $this, 'remove_noindex_directive' ), 11 );
+ $output = get_echo( 'wp_robots' );
+ $this->assertEmpty( $output );
+ }
+
+ /**
+ * @ticket 51511
+ */
+ public function test_wp_robots_parses_directives_correctly() {
+ add_filter(
+ 'wp_robots',
+ function( array $robots ) {
+ // Directives that should have values must use strings.
+ $robots['directive-with-value'] = 'yes';
+ $robots['directive-with-numeric-value'] = '1';
+ // Any non-string value will be evaluated as boolean.
+ // False-y directives will not be included.
+ $robots['directive-active-boolean'] = true;
+ $robots['directive-inactive-boolean'] = false;
+ $robots['directive-active-integer'] = 1;
+ $robots['directive-inactive-integer'] = 0;
+ return $robots;
+ }
+ );
+
+ $expected_directives_string = implode(
+ ', ',
+ array(
+ 'directive-with-value:yes',
+ 'directive-with-numeric-value:1',
+ 'directive-active-boolean',
+ 'directive-active-integer',
+ )
+ );
+
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'{$expected_directives_string}'", $output );
+ }
+
+ /**
+ * @ticket 51511
+ */
+ public function test_wp_robots_includes_basic_sanitization_follow_nofollow() {
+ // Only follow or nofollow can be present, with follow taking precedence.
+ add_filter( 'wp_robots', array( $this, 'add_follow_directive' ) );
+ add_filter( 'wp_robots', array( $this, 'add_nofollow_directive' ) );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'follow'", $output );
+
+ // Consider truthyness of the directive value though.
+ // Here nofollow is true, follow is false.
+ add_filter( 'wp_robots', array( $this, 'remove_follow_directive' ), 11 );
+ add_filter( 'wp_robots', array( $this, 'add_nofollow_directive' ), 11 );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'nofollow'", $output );
+
+ // Consider truthyness of the directive value though.
+ // Here follow is true, nofollow is false.
+ add_filter( 'wp_robots', array( $this, 'add_follow_directive' ), 12 );
+ add_filter( 'wp_robots', array( $this, 'remove_nofollow_directive' ), 12 );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'follow'", $output );
+ }
+
+ /**
+ * @ticket 51511
+ */
+ public function test_wp_robots_includes_basic_sanitization_archive_noarchive() {
+ // Only archive or noarchive can be present, with archive taking precedence.
+ add_filter( 'wp_robots', array( $this, 'add_archive_directive' ) );
+ add_filter( 'wp_robots', array( $this, 'add_noarchive_directive' ) );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'archive'", $output );
+
+ // Consider truthyness of the directive value though.
+ // Here noarchive is true, archive is false.
+ add_filter( 'wp_robots', array( $this, 'remove_archive_directive' ), 11 );
+ add_filter( 'wp_robots', array( $this, 'add_noarchive_directive' ), 11 );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'noarchive'", $output );
+
+ // Consider truthyness of the directive value though.
+ // Here archive is true, noarchive is false.
+ add_filter( 'wp_robots', array( $this, 'add_archive_directive' ), 12 );
+ add_filter( 'wp_robots', array( $this, 'remove_noarchive_directive' ), 12 );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'archive'", $output );
+ }
+
+ /**
+ * @ticket 51511
+ */
+ public function test_wp_robots_noindex() {
+ add_filter( 'wp_robots', 'wp_robots_noindex' );
+
+ update_option( 'blog_public', '1' );
+ $output = get_echo( 'wp_robots' );
+ $this->assertEmpty( $output );
+
+ update_option( 'blog_public', '0' );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'noindex, nofollow'", $output );
+ }
+
+ /**
+ * @ticket 51511
+ */
+ public function test_wp_robots_no_robots() {
+ add_filter( 'wp_robots', 'wp_robots_no_robots' );
+
+ update_option( 'blog_public', '1' );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'noindex, follow'", $output );
+
+ update_option( 'blog_public', '0' );
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'noindex, nofollow'", $output );
+ }
+
+ /**
+ * @ticket 51511
+ */
+ public function test_wp_robots_sensitive_page() {
+ add_filter( 'wp_robots', 'wp_robots_sensitive_page' );
+
+ $output = get_echo( 'wp_robots' );
+ $this->assertContains( "'noindex, noarchive'", $output );
+ }
+
+ public function add_noindex_directive( array $robots ) {
+ $robots['noindex'] = true;
+ return $robots;
+ }
+
+ public function remove_noindex_directive( array $robots ) {
+ $robots['noindex'] = false;
+ return $robots;
+ }
+
+ public function add_follow_directive( array $robots ) {
+ $robots['follow'] = true;
+ return $robots;
+ }
+
+ public function remove_follow_directive( array $robots ) {
+ $robots['follow'] = false;
+ return $robots;
+ }
+
+ public function add_nofollow_directive( array $robots ) {
+ $robots['nofollow'] = true;
+ return $robots;
+ }
+
+ public function remove_nofollow_directive( array $robots ) {
+ $robots['nofollow'] = false;
+ return $robots;
+ }
+
+ public function add_archive_directive( array $robots ) {
+ $robots['archive'] = true;
+ return $robots;
+ }
+
+ public function remove_archive_directive( array $robots ) {
+ $robots['archive'] = false;
+ return $robots;
+ }
+
+ public function add_noarchive_directive( array $robots ) {
+ $robots['noarchive'] = true;
+ return $robots;
+ }
+
+ public function remove_noarchive_directive( array $robots ) {
+ $robots['noarchive'] = false;
+ return $robots;
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/robots.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></div>
</body>
</html>