<!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>[9180] sites/trunk/wordpress.org/public_html/wp-content: WordPress.org, Plugin Directory, and Theme Directory: Sync the `hreflang` tag implementations.</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/9180">9180</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/9180","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>2019-10-15 06:53:44 +0000 (Tue, 15 Oct 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'>WordPress.org, Plugin Directory, and Theme Directory: Sync the `hreflang` tag implementations. This prevents linking to non-existent sites.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4713">#4713</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2019-10-14 16:04:00 UTC (rev 9179)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php 2019-10-15 06:53:44 UTC (rev 9180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,6 +835,44 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add_global_groups( array( 'locale-associations' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Google doesn't have support for a whole lot of languages and throws errors about it,
+ // so we exclude them, as we're otherwise outputting data that isn't used at all.
+ $unsupported_languages = array(
+ 'arq',
+ 'art',
+ 'art-xemoji',
+ 'ary',
+ 'ast',
+ 'az-ir',
+ 'azb',
+ 'bcc',
+ 'ff-sn',
+ 'frp',
+ 'fuc',
+ 'fur',
+ 'haz',
+ 'ido',
+ 'io',
+ 'kab',
+ 'li',
+ 'li-nl',
+ 'lmo',
+ 'me',
+ 'me-me',
+ 'rhg',
+ 'rup',
+ 'sah',
+ 'sc-it',
+ 'scn',
+ 'skr',
+ 'srd',
+ 'szl',
+ 'tah',
+ 'twd',
+ 'ty-tj',
+ 'tzm',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // WARNING: for any changes below, check other uses of the `locale-assosciations` group as there's shared cache keys in use.
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_key = $post ? 'local-sites-' . $post->post_name : 'local-sites';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === ( $sites = wp_cache_get( $cache_key, 'locale-associations' ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,8 +900,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">+ // Skip unsupported locales.
+ if ( in_array( $gp_locale->slug, $unsupported_languages ) ) {
+ unset( $sites[ $key ] );
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $sites[ $key ]->subdomain = $subdomains[ $site->wp_locale ]->subdomain;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Skip non-existing subdomains, e.g. 'de_CH_informal'.
+ if ( false !== strpos( $site->subdomain, '_' ) ) {
+ unset( $sites[ $key ] );
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Note that Google only supports ISO 639-1 codes.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $gp_locale->lang_code_iso_639_1 ) && isset( $gp_locale->country_code ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hreflang = $gp_locale->lang_code_iso_639_1 . '-' . $gp_locale->country_code;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp"></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/theme-directory/theme-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/theme-directory/theme-directory.php 2019-10-14 16:04:00 UTC (rev 9179)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2019-10-15 06:53:44 UTC (rev 9180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1104,6 +1104,45 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add_global_groups( array( 'locale-associations' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Google doesn't have support for a whole lot of languages and throws errors about it,
+ // so we exclude them, as we're otherwise outputting data that isn't used at all.
+ $unsupported_languages = array(
+ 'arq',
+ 'art',
+ 'art-xemoji',
+ 'ary',
+ 'ast',
+ 'az-ir',
+ 'azb',
+ 'bcc',
+ 'ff-sn',
+ 'frp',
+ 'fuc',
+ 'fur',
+ 'haz',
+ 'ido',
+ 'io',
+ 'kab',
+ 'li',
+ 'li-nl',
+ 'lmo',
+ 'me',
+ 'me-me',
+ 'rhg',
+ 'rup',
+ 'sah',
+ 'sc-it',
+ 'scn',
+ 'skr',
+ 'srd',
+ 'szl',
+ 'tah',
+ 'twd',
+ 'ty-tj',
+ 'tzm',
+ );
+
+ // WARNING: for any changes below, check other uses of the `locale-assosciations` group as there's shared cache keys in use.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === ( $sites = wp_cache_get( 'local-sites', 'locale-associations' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1114,13 +1153,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once GLOTPRESS_LOCALES_PATH;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $sites as $site ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $sites as $key => $site ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $gp_locale = GP_Locales::by_field( 'wp_locale', $site->locale );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $gp_locale ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $sites[ $site->locale ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $sites[ $key ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">+ // Skip non-existing subdomains, e.g. 'de_CH_informal'.
+ if ( false !== strpos( $site->subdomain, '_' ) ) {
+ unset( $sites[ $key ] );
+ continue;
+ }
+
+ // Skip unsupported locales.
+ if ( in_array( $gp_locale->slug, $unsupported_languages ) ) {
+ unset( $sites[ $key ] );
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $hreflang = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Note that Google only supports ISO 639-1 codes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1134,10 +1185,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $hreflang = $gp_locale->lang_code_iso_639_3;
</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 ( $hreflang && 'art' !== $hreflang ) {
- $sites[ $site->locale ]->hreflang = strtolower( $hreflang );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $hreflang ) {
+ $sites[ $key ]->hreflang = strtolower( $hreflang );
</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">- unset( $sites[ $site->locale ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $sites[ $key ] );
</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">@@ -1245,4 +1296,4 @@
</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"> return $link;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgfunctionsphp"></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/themes/pub/wporg/functions.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/themes/pub/wporg/functions.php 2019-10-14 16:04:00 UTC (rev 9179)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg/functions.php 2019-10-15 06:53:44 UTC (rev 9180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,6 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sites = wp_cache_get( 'local-sites', 'locale-associations' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // WARNING: for any changes below, check other uses of the `locale-assosciations` group as there's shared cache keys in use.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $sites ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,23 +249,42 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once GLOTPRESS_LOCALES_PATH;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $sites as $site ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $sites as $key => $site ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $gp_locale = \GP_Locales::by_field( 'wp_locale', $site->locale );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $gp_locale ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $sites[ $site->locale ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $sites[ $key ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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"> // Skip non-existing subdomains, e.g. 'de_CH_informal'.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $site->subdomain, '_' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $sites[ $site->locale ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $sites[ $key ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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 ( isset( $gp_locale->slug ) && ! in_array( $gp_locale->slug, $unsupported_languages ) ) {
- $sites[ $site->locale ]->hreflang = $gp_locale->slug;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Skip unsupported locales.
+ if ( in_array( $gp_locale->slug, $unsupported_languages ) ) {
+ unset( $sites[ $key ] );
+ continue;
+ }
+
+ $hreflang = false;
+
+ // Note that Google only supports ISO 639-1 codes.
+ if ( isset( $gp_locale->lang_code_iso_639_1 ) && isset( $gp_locale->country_code ) ) {
+ $hreflang = $gp_locale->lang_code_iso_639_1 . '-' . $gp_locale->country_code;
+ } elseif ( isset( $gp_locale->lang_code_iso_639_1 ) ) {
+ $hreflang = $gp_locale->lang_code_iso_639_1;
+ } elseif ( isset( $gp_locale->lang_code_iso_639_2 ) ) {
+ $hreflang = $gp_locale->lang_code_iso_639_2;
+ } elseif ( isset( $gp_locale->lang_code_iso_639_3 ) ) {
+ $hreflang = $gp_locale->lang_code_iso_639_3;
+ }
+
+ if ( $hreflang ) {
+ $sites[ $key ]->hreflang = strtolower( $hreflang );
</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">- unset( $sites[ $site->locale ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $sites[ $key ] );
</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>