<!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>[11415] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php: Main: Allow the Schema.org & Page Metadata to be set for the main WordPress.org homepage.</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/11415">11415</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/11415","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>2022-01-07 04:00:50 +0000 (Fri, 07 Jan 2022)</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'>Main: Allow the Schema.org & Page Metadata to be set for the main WordPress.org homepage.
See https://github.com/WordPress/wporg-mu-plugins/issues/42, https://github.com/WordPress/wporg-mu-plugins/issues/38</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp"></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-main/inc/page-meta-descriptions.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-main/inc/page-meta-descriptions.php 2022-01-06 07:51:48 UTC (rev 11414)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php 2022-01-07 04:00:50 UTC (rev 11415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Filtered Open Graph tags.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function custom_open_graph_tags( $tags = [] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wporg_global_header_options;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use `name=""` for description.
</span><span class="cx" style="display: block; padding: 0 10px"> // See Jetpacks Twitter Card for where it happens for the twitter:* fields.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,9 +25,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return str_replace( '<meta property="description"', '<meta name="description"', $html );
</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">- // Override the Front-page tags on Rosetta sites.
- if ( is_front_page() && isset( $GLOBALS['rosetta'] ) ) {
- $site_title = isset( $GLOBALS['wporg_global_header_options']['rosetta_title'] ) ? $GLOBALS['wporg_global_header_options']['rosetta_title'] : 'WordPress.org';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Override the Front-page tags.
+ if ( is_front_page() ) {
+ $site_title = ! empty( $wporg_global_header_options['rosetta_title'] ) ? $wporg_global_header_options['rosetta_title'] : 'WordPress';
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:type' => 'website',
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:title' => __( 'Blog Tool, Publishing Platform, and CMS', 'wporg' ) . " - {$site_title}",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,59 +198,71 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'jetpack_open_graph_tags', __NAMESPACE__ . '\custom_open_graph_tags' );
</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">- * Renders site's attributes for Rosetta sites.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Renders site's attributes for the WordPress.org frontpages (including Rosetta).
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://developers.google.com/search/docs/guides/enhance-site
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sites_attributes_schema() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_front_page() || ! isset( $GLOBALS['rosetta'] ) || empty( $GLOBALS['rosetta']->rosetta->glotpress_locale ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $rosetta;
+
+ if ( ! is_front_page() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $og_tags = \WordPressdotorg\MainTheme\custom_open_graph_tags();
- $locale = $GLOBALS['rosetta']->rosetta->glotpress_locale;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $og_tags = custom_open_graph_tags();
+ $locale_language = 'en';
+ $name = 'WordPress.org';
+
+ if ( ! empty( $rosetta->rosetta->glotpress_locale ) ) {
+ $locale_language = $rosetta->rosetta->glotpress_locale->slug;
+ $name = sprintf(
+ __( 'WordPress - %s', 'wporg' ),
+ $rosetta->rosetta->glotpress_locale->native_name
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="application/ld+json">
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "@context":"https://schema.org",
- "@graph":[
- {
- "@type":"Organization",
- "@id":"https://wordpress.org/#organization",
- "url":"https://wordpress.org/",
- "name":"WordPress",
- "logo":{
- "@type":"ImageObject",
- "@id":"https://wordpress.org/#logo",
- "url":"https://s.w.org/style/images/about/WordPress-logotype-wmark.png"
- },
- "sameAs":[
- "https://www.facebook.com/WordPress/",
- "https://twitter.com/WordPress",
- "https://en.wikipedia.org/wiki/WordPress"
- ]
- },
- {
- "@type":"WebSite",
- "@id":"<?php echo esc_js( home_url( '/#website' ) ); ?>",
- "url":"<?php echo esc_js( home_url( '/' ) ); ?>",
- "name":"<?php echo esc_js( sprintf( __( 'WordPress - %s', 'wporg' ), $locale->native_name ) ); ?>",
- "publisher":{
- "@id":"https://wordpress.org/#organization"
- }
- },
- {
- "@type":"WebPage",
- "@id":"<?php echo esc_js( home_url( '/' ) ); ?>",
- "url":"<?php echo esc_js( home_url( '/' ) ); ?>",
- "inLanguage":"<?php echo esc_js( $locale->slug ); ?>",
- "name":"<?php echo esc_js( $og_tags['og:title'] ); ?>",
- "description":"<?php echo esc_js( $og_tags['og:description'] ); ?>",
- "isPartOf":{
- "@id":"<?php echo esc_js( home_url( '/#website' ) ); ?>"
- }
- }
- ]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "@context":"https://schema.org",
+ "@graph":[
+ {
+ "@type":"Organization",
+ "@id":"https://wordpress.org/#organization",
+ "url":"https://wordpress.org/",
+ "name":"WordPress",
+ "logo":{
+ "@type":"ImageObject",
+ "@id":"https://wordpress.org/#logo",
+ "url":"https://s.w.org/style/images/about/WordPress-logotype-wmark.png"
+ },
+ "sameAs":[
+ "https://www.facebook.com/WordPress/",
+ "https://twitter.com/WordPress",
+ "https://en.wikipedia.org/wiki/WordPress"
+ ]
+ },
+ {
+ "@type":"WebSite",
+ "@id":"<?php echo esc_js( home_url( '/#website' ) ); ?>",
+ "url":"<?php echo esc_js( home_url( '/' ) ); ?>",
+ "name":"<?php echo esc_js( $name ); ?>",
+ "publisher":{
+ "@id":"https://wordpress.org/#organization"
+ }
+ },
+ {
+ "@type":"WebPage",
+ "@id":"<?php echo esc_js( home_url( '/' ) ); ?>",
+ "url":"<?php echo esc_js( home_url( '/' ) ); ?>",
+ "inLanguage":"<?php echo esc_js( $locale_language ); ?>",
+ "name":"<?php echo esc_js( $og_tags['og:title'] ); ?>",
+ "description":"<?php echo esc_js( $og_tags['og:description'] ); ?>",
+ "isPartOf":{
+ "@id":"<?php echo esc_js( home_url( '/#website' ) ); ?>"
+ }
+ }
+ ]
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>