<!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>[9862] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Remove specific SEO fixes that are included in the generic SEO fixes plugin.</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="http://meta.trac.wordpress.org/changeset/9862">9862</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9862","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-05-13 05:02:12 +0000 (Wed, 13 May 2020)</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'>Plugin Directory: Remove specific SEO fixes that are included in the generic SEO fixes plugin.
See <a href="http://meta.trac.wordpress.org/ticket/5173">#5173</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2020-05-13 05:00:13 UTC (rev 9861)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2020-05-13 05:02:12 UTC (rev 9862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,11 +49,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'single_term_title', array( $this, 'filter_single_term_title' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', array( $this, 'filter_rel_nofollow_ugc' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', array( Template::class, 'json_ld_schema' ), 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wp_head', array( Template::class, 'output_meta' ), 1 );
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', array( Template::class, 'hreflang_link_attributes' ), 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wp_head', array( Template::class, 'archive_link_rel_prev_next' ), 3 );
- add_action( 'wp_head', array( Template::class, 'archive_rel_canonical_link' ), 3 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add no-index headers where appropriate.
+ add_filter( 'wporg_noindex_request', [ Template::class, 'should_noindex_request' ] );
+
+ // Fix the Canonical link when needed.
+ add_action( 'wporg_canonical_url', [ Template::class, 'wporg_canonical_url' ] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Cron tasks.
</span><span class="cx" style="display: block; padding: 0 10px"> new Jobs\Manager();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,9 +547,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'wp_head', 'feed_links', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'wp_head', 'feed_links_extra', 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove the core <link rel="canonical"> as we've got a plugin-directory-specific version
- remove_action( 'wp_head', 'rel_canonical' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_term', array( __NAMESPACE__ . '\I18n', 'translate_term' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', array( $this, 'translate_post_content' ), 1, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title', array( $this, 'translate_post_title' ), 1, 2 );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php 2020-05-13 05:00:13 UTC (rev 9861)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php 2020-05-13 05:02:12 UTC (rev 9862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,77 +154,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $metas = [];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $noindex = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Prevent duplicate search engine results.
- if ( get_query_var( 'plugin_advanced' ) || is_search() ) {
- $noindex = true;
- } elseif ( is_singular( 'plugin' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_singular( 'plugin' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metas[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<meta name="description" value="%s" />',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( get_the_excerpt() )
</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 noindex for closed or outdated plugins.
- if ( 'publish' !== get_post_status() || self::is_plugin_outdated() ) {
- $noindex = true;
- }
- } elseif ( is_tax() && $wp_query->found_posts <= 3 ) {
- $noindex = true;
</del><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 ( $noindex ) {
- $metas[] = '<meta name="robots" content="noindex,follow" />' . "\n";
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> echo implode( "\n", $metas );
</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">- * Prints <link rel="prev|next"> tags for archives.
- *
- * @static
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Whether the current request should be noindexed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function archive_link_rel_prev_next() {
- global $paged, $wp_query, $wp_rewrite;
- if ( ! is_archive() && ! is_search() ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function should_noindex_request( $noindex ) {
+ if ( get_query_var( 'plugin_advanced' ) ) {
+ $noindex = true;
+ } else if ( is_singular( 'plugin' ) && self::is_plugin_outdated() ) {
+ $noindex = true;
</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">- $max_page = $wp_query->max_num_pages;
- if ( ! $paged ) {
- $paged = 1;
- }
-
- $nextpage = intval( $paged ) + 1;
- $prevpage = intval( $paged ) - 1;
-
- // re-implement get_pagenum_link() using our canonical url.
- $current_url = Template::get_current_url();
- if ( ! $current_url ) {
- return;
- }
-
- $current_url = remove_query_arg( 'paged', $current_url );
- $current_url = preg_replace( "|{$wp_rewrite->pagination_base}/\d+/?$|", '', $current_url );
-
- // Just assume pretty permalinks everywhere.
- $next_url = $current_url . "{$wp_rewrite->pagination_base}/{$nextpage}/";
- $prev_url = $current_url . ( $prevpage > 1 ? "{$wp_rewrite->pagination_base}/{$prevpage}/" : '' );
-
- if ( $prevpage >= 1 ) {
- printf(
- '<link rel="prev" href="%s">' . "\n",
- esc_url( $prev_url )
- );
- }
-
- if ( $nextpage <= $max_page ) {
- printf(
- '<link rel="next" href="%s">' . "\n",
- esc_url( $next_url )
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $noindex;
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1031,46 +982,12 @@
</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">- * Outputs a <link rel="canonical"> on archive pages.
- */
- public static function archive_rel_canonical_link() {
- if ( $url = self::get_current_url() ) {
- printf(
- '<link rel="canonical" href="%s">' . "\n",
- esc_url( $url )
- );
- }
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Get the current front-end requested URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_current_url( $path_only = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $queried_object = get_queried_object();
- $link = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_tax() || is_tag() || is_category() ) {
- $link = get_term_link( $queried_object );
- } elseif ( is_singular() ) {
- $link = get_permalink( $queried_object );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = \WordPressdotorg\SEO\Canonical\get_canonical_url();
</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 ( is_singular( 'plugin' ) && get_query_var( 'plugin_advanced' ) ) {
- $link .= 'advanced/';
- }
- } elseif ( is_search() ) {
- $link = home_url( 'search/' . urlencode( get_query_var( 's' ) ) . '/' );
- } elseif ( is_front_page() ) {
- $link = home_url( '/' );
- }
-
- if ( $link && is_paged() ) {
- if ( false !== stripos( $link, '?' ) ) {
- $link = add_query_arg( 'paged', (int) get_query_var( 'paged' ), $link );
- } else {
- $link = rtrim( $link, '/' ) . '/page/' . (int) get_query_var( 'paged' ) . '/';
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $path_only && $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path = parse_url( $link, PHP_URL_PATH );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $query = parse_url( $link, PHP_URL_QUERY ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,6 +1001,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">+ * Filter the WordPress.org Canonical URL to understand the Plugin Directory.
+ */
+ public static function wporg_canonical_url( $link ) {
+ if ( is_singular( 'plugin' ) && get_query_var( 'plugin_advanced' ) ) {
+ $link = get_permalink( get_queried_object() ) . 'advanced/';
+ }
+
+ return $link;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Fetch plugin Screenshots, accounting for localised screenshots.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @static
</span></span></pre>
</div>
</div>
</body>
</html>