<!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>[11451] sites/trunk/wordpress.org/public_html/wp-content: Themes: Use a new method to fetch the localised site name.</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/11451">11451</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/11451","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-17 06:48:02 +0000 (Mon, 17 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'>Themes: Use a new method to fetch the localised site name.
This is to remove the reliance upon `$wporg_global_header_options`.
See https://github.com/WordPress/wporg-mu-plugins/issues/42</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubsitebrandingphp">sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/site-branding.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpatternsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubsitebrandingphp"></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/mu-plugins/pub/site-branding.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/mu-plugins/pub/site-branding.php 2022-01-17 06:22:22 UTC (rev 11450)
+++ sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/site-branding.php 2022-01-17 06:48:02 UTC (rev 11451)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,69 +1,99 @@
</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">-namespace WordPressdotorg\MU_Plugins\Site_Branding;
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Plugin Name: WordPress.org Site Branding
</span><span class="cx" style="display: block; padding: 0 10px"> * Description: Ensures that <title> tags on WordPress.org always include WordPress, and WordPress favicons.
</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">-add_filter( 'document_title_parts', __NAMESPACE__ . '\document_title_parts', 100 );
-function document_title_parts( $parts ) {
- global $rosetta;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace WordPressdotorg\MU_Plugins\Site_Branding {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // In some places on WordPress.org the document title is used within the theme, don't affect title calls after the </head>.
- if ( did_action( 'wp_body_open' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filter the document title parts to ensure that WordPress is replaced into it consistently.
+ */
+ function document_title_parts( $parts ) {
+ global $rosetta;
+
+ // In some places on WordPress.org the document title is used within the theme, don't affect title calls after the </head>.
+ if ( did_action( 'wp_body_open' ) ) {
+ return $parts;
+ }
+
+ $combined = implode( ' ', $parts );
+
+ // Ensure that 'WordPress' is present in the title of the URL
+ if ( false === strpos( $combined, 'WordPress' ) ) {
+ $parts['wporg-suffix'] = get_wordpress_brand();
+ }
+
+ // Override anything that set part of the title directly to WordPress.org on rosetta sites.
+ if ( isset( $rosetta ) ) {
+ foreach ( [ 'site', 'tagline' ] as $field ) {
+ if ( ! empty( $parts[ $field ] ) && 'WordPress.org' === $parts[ $field ] ) {
+ $parts[ $field ] = get_wordpress_brand();
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $parts;
</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( 'document_title_parts', __NAMESPACE__ . '\document_title_parts', 100 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $combined = implode( ' ', $parts );
-
- // Ensure that 'WordPress' is present in the title of the URL
- if ( false === strpos( $combined, 'WordPress' ) ) {
- $parts['wporg-suffix'] = get_wordpress_brand();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Always suffix the WordPress brand to bbPress titles.
+ */
+ function bbp_title( $title ) {
+ return $title . get_wordpress_brand();
</ins><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( 'bbp_title', __NAMESPACE__ . '\bbp_title', 100 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Override anything that set part of the title directly to WordPress.org on rosetta sites.
- if ( isset( $rosetta ) ) {
- foreach ( [ 'site', 'tagline' ] as $field ) {
- if ( ! empty( $parts[ $field ] ) && 'WordPress.org' === $parts[ $field ] ) {
- $parts[ $field ] = get_wordpress_brand();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filter Jetpack opengraph tags to reference the localised WordPress.org site.
+ */
+ function jetpack_opengraph( $fields ) {
+ if ( isset( $fields['og:site_name'] ) && 'WordPress.org' === $fields['og:site_name'] ) {
+ $fields['og:site_name'] = get_wordpress_brand();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return $fields;
</ins><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( 'jetpack_open_graph_tags', __NAMESPACE__ . '\jetpack_opengraph', 100 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $parts;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Return the 'Brand' of the WordPress.org site.
+ *
+ * This is "WordPress.org" or a localised variant such as "WordPress Deutch".
+ */
+ function get_wordpress_brand() {
+ global $rosetta;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'bbp_title', __NAMESPACE__ . '\bbp_title', 100 );
-function bbp_title( $title ) {
- return $title . get_wordpress_brand();
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $rosetta ) ) {
+ return 'WordPress.org';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Return the 'Brand' of the WordPress.org site.
- *
- * This is "WordPress.org" or a localised variant such as "WordPress Deutch".
- */
-function get_wordpress_brand() {
- global $rosetta;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root_id = $rosetta->get_root_site_id();
+ $name = get_blog_option( $root_id, 'blogname' );
</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 ( ! isset( $rosetta ) ) {
- return 'WordPress.org';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== strpos( $name, 'WordPress' ) ) {
+ return $name;
+ }
+
+ return "WordPress.org $name";
</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">- $root_id = $rosetta->get_root_site_id();
- $name = get_blog_option( $root_id, 'blogname' );
-
- if ( false !== strpos( $name, 'WordPress' ) ) {
- return $name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Output the WordPress favicon on all WordPress.org themes.
+ */
+ function favicon_icon() {
+ echo '<link rel="icon" href="https://s.w.org/favicon.ico?2" type="image/x-icon" />', "\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wp_head', __NAMESPACE__ . '\favicon_icon', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return "WordPress.org $name";
</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">-/**
- * Output the WordPress favicon on all WordPress.org themes.
- */
-function favicon_icon() {
- echo '<link rel="icon" href="https://s.w.org/favicon.ico?2" type="image/x-icon" />', "\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace WordPressdotorg {
+ /**
+ * Function to call as `\WordPressdotorg\site_brand()` in other plugins.
+ */
+ function site_brand() {
+ return \WordPressdotorg\MU_Plugins\Site_Branding\get_wordpress_brand();
+ }
</ins><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', __NAMESPACE__ . '\favicon_icon', 1 );
</del></span></pre></div>
<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-17 06:22:22 UTC (rev 11450)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php 2022-01-17 06:48:02 UTC (rev 11451)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,8 +17,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wporg_global_header_options;
-
</del><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="cx" style="display: block; padding: 0 10px"> add_filter( 'jetpack_open_graph_output', function( $html ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +25,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Override the Front-page tags.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_front_page() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_title = ! empty( $wporg_global_header_options['rosetta_title'] ) ? $wporg_global_header_options['rosetta_title'] : 'WordPress';
</del><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">@@ -34,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:description' => __( 'Open source software which you can use to easily create a beautiful website, blog, or app.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Open source software which you can use to easily create a beautiful website, blog, or app.', 'wporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:url' => home_url( '/' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'og:site_name' => $site_title,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'og:site_name' => 'WordPress.org', // Rosetta title will automatically be inserted.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'og:image' => 'https://s.w.org/images/home/screen-themes.png?3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:locale' => get_locale(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'twitter:card' => 'summary_large_image',
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpatternsfunctionsphp"></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-patterns/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-patterns/functions.php 2022-01-17 06:22:22 UTC (rev 11450)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/functions.php 2022-01-17 06:48:02 UTC (rev 11451)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,15 +283,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Add meta tags for richer social media integrations.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_social_meta_tags() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wporg_global_header_options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $og_fields = [];
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_image = get_stylesheet_directory_uri() . '/images/social-image.png';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $og_fields = [];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_title = function_exists( '\WordPressdotorg\site_brand' ) ? \WordPressdotorg\site_brand() : 'WordPress.org';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_front_page() || is_home() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $og_fields = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:title' => __( 'Block Pattern Directory', 'wporg-patterns' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:description' => __( 'Add a beautifully designed, ready to go layout to any WordPress site with a simple copy/paste.', 'wporg-patterns' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'og:site_name' => $wporg_global_header_options['rosetta_title'] ?? 'WordPress.org',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'og:site_name' => $site_title,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'og:type' => 'website',
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:url' => home_url(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:image' => esc_url( $default_image ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $og_fields = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:title' => sprintf( __( 'Block Patterns: %s', 'wporg-patterns' ), esc_attr( single_term_title( '', false ) ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:description' => __( 'Add a beautifully designed, ready to go layout to any WordPress site with a simple copy/paste.', 'wporg-patterns' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'og:site_name' => esc_attr( $wporg_global_header_options['rosetta_title'] ?? 'WordPress.org' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'og:site_name' => $site_title,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'og:type' => 'website',
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:url' => esc_url( get_term_link( get_queried_object_id() ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:image' => esc_url( $default_image ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,8 +308,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( is_singular( POST_TYPE ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $og_fields = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:title' => the_title_attribute( array( 'echo' => false ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'og:description' => esc_attr( strip_tags( get_post_meta( get_the_ID(), 'wpop_description', true ) ) ),
- 'og:site_name' => esc_attr( $wporg_global_header_options['rosetta_title'] ?? 'WordPress.org' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'og:description' => strip_tags( get_post_meta( get_the_ID(), 'wpop_description', true ) ),
+ 'og:site_name' => $site_title,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'og:type' => 'website',
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:url' => esc_url( get_permalink() ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:image' => esc_url( $default_image ),
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfunctionsphp"></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-plugins/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-plugins/functions.php 2022-01-17 06:22:22 UTC (rev 11450)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php 2022-01-17 06:48:02 UTC (rev 11451)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,12 +330,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Adds meta tags for richer social media integrations.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function social_meta_data() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wporg_global_header_options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_title = function_exists( '\WordPressdotorg\site_brand' ) ? \WordPressdotorg\site_brand() : 'WordPress.org';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_front_page() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $og_fields = [
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:title' => __( 'WordPress Plugins', 'wporg-plugins' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:description' => __( 'Choose from thousands of free plugins to build, customize, and enhance your WordPress website.', 'wporg-plugins' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'og:site_name' => $wporg_global_header_options['rosetta_title'] ?? 'WordPress.org',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'og:site_name' => $site_title,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'og:type' => 'website',
</span><span class="cx" style="display: block; padding: 0 10px"> 'og:url' => home_url(),
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<meta property="og:title" content="%s" />' . "\n", the_title_attribute( array( 'echo' => false ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<meta property="og:description" content="%s" />' . "\n", esc_attr( strip_tags( get_the_excerpt() ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<meta name="description" content="%s" />' . "\n", esc_attr( strip_tags( get_the_excerpt() ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( '<meta property="og:site_name" content="%s" />' . "\n", esc_attr( $wporg_global_header_options['rosetta_title'] ?? 'WordPress.org' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( '<meta property="og:site_name" content="%s" />' . "\n", esc_attr( $site_title ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( '<meta property="og:type" content="website" />' . "\n" );
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<meta property="og:url" content="%s" />' . "\n", esc_url( get_permalink() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<meta name="twitter:card" content="summary_large_image">' . "\n" );
</span></span></pre>
</div>
</div>
</body>
</html>