<!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>[9863] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php: Support Forums: 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/9863">9863</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/9863","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:03:21 +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'>Support Forums: 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_htmlwpcontentpluginssupportforumsincclasshooksphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasshooksphp"></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/support-forums/inc/class-hooks.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/support-forums/inc/class-hooks.php 2020-05-13 05:02:12 UTC (rev 9862)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php 2020-05-13 05:03:21 UTC (rev 9863)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,15 +22,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_insert_post_data', array( $this, 'set_post_date_gmt_for_pending_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_print_footer_scripts', array( $this, 'replace_quicktags_blockquote_button' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Output rel="canonical" meta tag. Runs before WP's rel_canonical to unhook that if needed.
- add_action( 'wp_head', array( $this, 'rel_canonical' ), 9 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add bbPress support to the WordPress.org SEO plugin.
+ add_filter( 'wporg_canonical_base_url', array( $this, 'wporg_canonical_base_url' ) );
+ add_filter( 'wporg_canonical_url', array( $this, 'wporg_canonical_url' ) );
+ // Correct the number of pages, to respect the bbPress queries.
+ add_filter( 'wporg_rel_next_pages', array( $this, 'rel_next_prev_max_pages' ) );
+ // Add extra conditionals to the noindexing.
+ add_filter( 'wporg_noindex_request', array( $this, 'should_noindex_robots' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Output rel="next", rel="prev" meta tags.
- add_action( 'wp_head', array( $this, 'rel_next_prev' ), 9 );
-
- // Output robots headers.
- add_action( 'wp_head', array( $this, 'robots_noindex_header' ));
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Output meta description.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', array( $this, 'meta_description' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,14 +364,9 @@
</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">- * Returns the canonical URL for various bbPress pages.
- *
- * @return array The canonical URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add bbPress support to the WordPress.org SEO plugin for Canonical locations.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function get_canonical_url() {
- $canonical_url = false;
- $supports_paged = true;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wporg_canonical_base_url( $canonical_url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_topic_tag() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $canonical_url = bbp_get_topic_tag_link();
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( bbp_is_single_view() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,41 +380,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( bbpress()->displayed_user && bbpress()->displayed_user->exists() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // This covers all user pages rather than using 6 different bbp_is_*() calls.
</span><span class="cx" style="display: block; padding: 0 10px"> $canonical_url = 'https://profiles.wordpress.org/' . bbpress()->displayed_user->user_nicename . '/';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $supports_paged = false;
</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">- $canonical_url = mb_strtolower( $canonical_url, 'UTF-8' );
-
- return [ $canonical_url, $supports_paged ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $canonical_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Outputs <link rel="canonical"> tags for various bbPress pages.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add bbPress support to the WordPress.org SEO plugin for Canonical locations.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function rel_canonical() {
- list( $canonical_url, $canonical_supports_paged ) = $this->get_canonical_url();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wporg_canonical_url( $canonical_url ) {
+ global $wp_rewrite;
</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 ( bbp_is_single_topic() || bbp_is_single_forum() ) {
- remove_action( 'wp_head', 'rel_canonical' ); // Doesn't handle pagination.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // profiles links don't support pagination.
+ if ( false !== stripos( $canonical_url, 'profiles.wordpress.org' ) ) {
+ $canonical_url = remove_query_arg( 'paged', $canonical_url );
+ $canonical_url = preg_replace( "#/{$wp_rewrite->pagination_base}/\d+/?($|\?)#", '$1', $canonical_url );
</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">- // Make sure canonical has pagination if needed.
- $page = get_query_var( 'paged', 0 );
- if ( $canonical_url && $canonical_supports_paged && $page >= 2 ) {
- $canonical_url .= 'page/' . absint( $page ) . '/';
- }
-
- if ( $canonical_url ) {
- echo '<link rel="canonical" href="' . esc_url( $canonical_url ) . '" />' . "\n";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $canonical_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Adds noindex robots headers to various pages.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enables the noindex robots headers.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function robots_noindex_header() {
- $robots = false;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function should_noindex_robots( $robots ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_search() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // #3955
</span><span class="cx" style="display: block; padding: 0 10px"> $robots = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,21 +498,13 @@
</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 ( $robots ) {
- echo '<meta name="robots" content="noindex, follow" />',"\n";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Outputs rel="next", rel="prev" for paginated archives.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add bbPress support to the WordPress.org SEO plugin for rel="next|prev" archive tags.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function rel_next_prev() {
- global $wp_query;
-
- list( $canonical_url ) = $this->get_canonical_url();
-
- $max_pages = $wp_query->max_num_pages;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function rel_next_prev_max_pages( $max_pages ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_single_view() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbpress()->topic_query->query ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_view_query(); // Populate bbpress()->topic_query.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,11 +511,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> bbpress()->topic_query->is_tax = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $max_pages = bbpress()->topic_query->max_num_pages;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( bbp_is_single_topic() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbpress()->reply_query->query ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_has_replies(); // Populate bbpress()->reply_query.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $max_pages = bbpress()->reply_query->max_num_pages;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( bbp_is_single_forum() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $topic_count = get_post_meta( get_queried_object_id(), '_bbp_topic_count', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $topic_count ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,23 +525,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 ( ! $canonical_url || ! $max_pages ) {
- return;
- }
-
- $page = max( 1, get_query_var( 'paged', 0 ) );
- $next_page = min( $page + 1, $max_pages );
- $prev_page = max( $page - 1, 1 );
-
- if ( $page < $max_pages ) {
- $next_page_url = $canonical_url . 'page/' . absint( $next_page ) . '/';
- echo '<link rel="next" href="' . esc_url( $next_page_url ) . '" />' . "\n";
- }
-
- if ( $page > 1 ) {
- $prev_page_url = $canonical_url . ( $prev_page > 1 ? 'page/' . absint( $prev_page ) . '/' : '' );
- echo '<link rel="prev" href="' . esc_url( $prev_page_url ) . '" />' . "\n";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $max_pages;
</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>
</div>
</body>
</html>