<!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>[11778] sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub: Branding: Set a Default site icon, but don't use it by default for Opengraph tags.</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/11778">11778</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/11778","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-04-22 02:27:45 +0000 (Fri, 22 Apr 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'>Branding: Set a Default site icon, but don't use it by default for Opengraph tags.
See <a href="http://meta.trac.wordpress.org/ticket/6287">#6287</a></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>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubjetpacksocialmetadataphp">sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/jetpack-social-metadata.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubjetpacksocialmetadataphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/jetpack-social-metadata.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/jetpack-social-metadata.php 2022-04-20 05:41:34 UTC (rev 11777)
+++ sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/jetpack-social-metadata.php 2022-04-22 02:27:45 UTC (rev 11778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,55 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Plugin Name: WordPress.org Jetpack social metadata
- */
-
-function wporg_default_og_image() {
- return 'https://s.w.org/images/backgrounds/wordpress-bg-medblue.png';
-}
-add_filter( 'jetpack_open_graph_image_default', 'wporg_default_og_image' );
-
-/**
- * To prevent a cropped version of the og:image on Twitter, provide a square version.
- */
-function wporg_default_twitter_image() {
- return 'https://s.w.org/images/backgrounds/wordpress-bg-medblue-square.png';
-}
-add_filter( 'jetpack_twitter_cards_image_default', 'wporg_default_twitter_image' );
-
-function _wporg_replace_image_size( $url ) {
- return preg_replace( '/-\d+x\d+(\..+$)/', '$1', $url, 1 );
-}
-
-/**
- * Jetpack extracts image URLs like they are used in the content which leads
- * to blurry previews if they are too small.
- * This removes the size part of the image URL so the full URL is used.
- */
-function wporg_fix_image_urls( $tags ) {
- $image_tags = [ 'og:image', 'og:image:secure_url', 'twitter:image' ];
-
- foreach ( $image_tags as $image_tag ) {
- if ( isset( $tags[ $image_tag ] ) ) {
- if ( is_string( $tags[ $image_tag ] ) ) {
- $tags[ $image_tag ] = _wporg_replace_image_size( $tags[ $image_tag ] );
- } elseif ( is_array( $tags[ $image_tag ] ) ) {
- $tags[ $image_tag ] = array_map( '_wporg_replace_image_size', $tags[ $image_tag ] );
- }
- }
- }
-
- return $tags;
-}
-add_filter( 'jetpack_open_graph_tags', 'wporg_fix_image_urls', 20 );
-
-/**
- * Customize the Twitter username used as "twitter:site" Twitter Card Meta Tag.
- *
- * This username will also be appended to tweets launched by the tweet button.
- *
- * @param string $handle Twitter Username.
- */
-function jetpack_twitter_cards_site_tag_wordpress( $handle ) {
- return $handle ?: 'WordPress';
-}
-add_filter( 'jetpack_twitter_cards_site_tag', 'jetpack_twitter_cards_site_tag_wordpress' );
</del></span></pre></div>
<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-04-20 05:41:34 UTC (rev 11777)
+++ sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/site-branding.php 2022-04-22 02:27:45 UTC (rev 11778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,16 +48,73 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter Jetpack opengraph tags to reference the localised WordPress.org site.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function jetpack_opengraph( $fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function jetpack_open_graph_tags( $fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $fields['og:site_name'] ) && 'WordPress.org' === $fields['og:site_name'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields['og:site_name'] = get_wordpress_brand();
</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">+ // Don't use our default Site Logo for default Jetpack Opengraph fields.
+ $default_site_logo = get_site_icon_url(); // Namespaced filter, not the WordPress function.
+ if ( $default_site_logo ) {
+ if ( ! empty( $fields['og:image'] ) && $fields['og:image'] === $default_site_logo ) {
+ $fields['og:image'] = jetpack_open_graph_image_default();
+ unset( $fields['og:image:width'], $fields['og:image:height'], $fields['og:image:secure_url'] );
+ }
+
+ if ( ! empty( $fields['twitter:image'] ) && $fields['twitter:image'] === $default_site_logo ) {
+ $fields['twitter:image'] = jetpack_twitter_cards_image_default();
+ }
+ }
+
+ /*
+ * Jetpack extracts image URLs like they are used in the content which leads
+ * to blurry previews if they are too small.
+ * This removes the size part of the image URL so the full URL is used.
+ */
+ $strip_size = function( $url ) {
+ return preg_replace( '/-\d+x\d+(\..+$)/', '$1', $url, 1 );
+ };
+ foreach ( [ 'og:image', 'og:image:secure_url', 'twitter:image' ] as $field ) {
+ if ( isset( $fields[ $field ] ) ) {
+ $fields[ $field ] = is_string( $fields[ $field ] ) ?
+ $strip_size( $fields[ $field ] ) :
+ array_map( $strip_size, $fields[ $field ] );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $fields;
</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( 'jetpack_open_graph_tags', __NAMESPACE__ . '\jetpack_opengraph', 100 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'jetpack_open_graph_tags', __NAMESPACE__ . '\jetpack_open_graph_tags', 100 );
</ins><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">+ * Set a default og:image image.
+ */
+ function jetpack_open_graph_image_default() {
+ return 'https://s.w.org/images/backgrounds/wordpress-bg-medblue.png';
+ }
+ add_filter( 'jetpack_open_graph_image_default', __NAMESPACE__ . '\jetpack_open_graph_image_default' );
+
+ /**
+ * To prevent a cropped version of the og:image on Twitter, provide a square version.
+ */
+ function jetpack_twitter_cards_image_default() {
+ return 'https://s.w.org/images/backgrounds/wordpress-bg-medblue-square.png';
+ }
+ add_filter( 'jetpack_twitter_cards_image_default', __NAMESPACE__ . '\jetpack_twitter_cards_image_default' );
+
+ /**
+ * Customize the Twitter username used as "twitter:site" Twitter Card Meta Tag.
+ *
+ * This username will also be appended to tweets launched by the tweet button.
+ *
+ * @param string $handle Twitter Username.
+ */
+ function jetpack_twitter_cards_site_tag( $handle ) {
+ return $handle ?: 'WordPress';
+ }
+ add_filter( 'jetpack_twitter_cards_site_tag', __NAMESPACE__ . '\jetpack_twitter_cards_site_tag' );
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Return the 'Brand' of the WordPress.org site.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This is "WordPress.org" or a localised variant such as "WordPress Deutch".
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,13 +137,21 @@
</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">- * Output the WordPress favicon on all WordPress.org themes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Set a default Site Icon if one is not set.
+ *
+ * Causes the icon to be set for all WordPress.org themes.
+ *
+ * NOTE: See the above `jetpack_open_graph_tags()` function for where this is overridden for OpenGraph.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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">+ function get_site_icon_url( $url = '', $size = 0 ) {
+ // Return the favicon for the 32px variety if needed, the wmark image is just a higher resolution variant.
+ if ( 32 === $size ) {
+ return $url ?: 'https://s.w.org/favicon.ico?2';
+ }
+
+ return $url ?: 'https://s.w.org/images/wmark.png';
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'get_site_icon_url', __NAMESPACE__ . '\get_site_icon_url', 10, 2 );
</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"> namespace WordPressdotorg {
</span></span></pre>
</div>
</div>
</body>
</html>