<!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>[193772] trunk/Websites/webkit.org</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 { 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">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193772">193772</a></dd>
<dt>Author</dt> <dd>jond@apple.com</dd>
<dt>Date</dt> <dd>2015-12-08 12:43:33 -0800 (Tue, 08 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix social meta for home page.
https://bugs.webkit.org/show_bug.cgi?id=151764
Reviewed by Timothy Hatcher.
* wp-content/plugins/social-meta.php:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsiteswebkitorgChangeLog">trunk/Websites/webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsiteswebkitorgwpcontentpluginssocialmetaphp">trunk/Websites/webkit.org/wp-content/plugins/social-meta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsiteswebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/ChangeLog (193771 => 193772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/ChangeLog 2015-12-08 20:42:42 UTC (rev 193771)
+++ trunk/Websites/webkit.org/ChangeLog 2015-12-08 20:43:33 UTC (rev 193772)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-12-08 Jonathan Davis <jond@apple.com>
+
+ Fix social meta for home page.
+ https://bugs.webkit.org/show_bug.cgi?id=151764
+
+ Reviewed by Timothy Hatcher.
+
+ * wp-content/plugins/social-meta.php:
+
</ins><span class="cx"> 2015-12-07 Jonathan Davis <jond@apple.com>
</span><span class="cx">
</span><span class="cx"> Implemented a workaround for sharp SVG WebKit logo.
</span></span></pre></div>
<a id="trunkWebsiteswebkitorgwpcontentpluginssocialmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/wp-content/plugins/social-meta.php (193771 => 193772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/wp-content/plugins/social-meta.php 2015-12-08 20:42:42 UTC (rev 193771)
+++ trunk/Websites/webkit.org/wp-content/plugins/social-meta.php 2015-12-08 20:43:33 UTC (rev 193772)
</span><span class="lines">@@ -7,60 +7,90 @@
</span><span class="cx"> Author URI: http://webkit.org
</span><span class="cx"> */
</span><span class="cx">
</span><del>-add_action('wp_head', function() { ?>
- <?php
</del><ins>+add_action('wp_head', function() {
+
+ $title = get_the_title();
+ $description = get_the_excerpt();
+ $type = 'article';
+
+ $categories = array();
+ $tags = array();
+ $image_url = '';
+ $twitter_handle = '';
+
+ if (is_front_page() || is_home()) {
+ $title = get_bloginfo('name');
+ $description = get_bloginfo('description');
+ $type = 'website';
+ }
+
+ if (is_single()) {
</ins><span class="cx"> $image_src = wp_get_attachment_image_src( get_post_thumbnail_id($post_id), 'large' );
</span><span class="cx"> $image_url = $image_src[0];
</span><del>- ?>
</del><ins>+
+ $categories = wp_get_object_terms(get_the_ID(), 'category', array('fields' => 'names'));
+ $tags = wp_get_object_terms(get_the_ID(), 'post_tag', array('fields' => 'names'));
</ins><span class="cx">
</span><ins>+ // Post author data is not available in wp_head filter context
+ $post = get_post();
+ $twitter_handle = get_the_author_meta('twitter', $post->post_author);
+ }
+
+?>
+
</ins><span class="cx"> <!-- Schema.org markup -->
</span><del>- <meta itemprop="name" content="<?php the_title(); ?>">
- <meta itemprop="description" content="<?php the_excerpt(); ?>">
- <?php if ( $image_url ): ?>
- <meta itemprop="image" content="<?php echo $image_url; ?>">
- <?php endif; ?>
</del><ins>+ <meta itemprop="name" content="<?php echo esc_attr($title); ?>">
+<?php if ($description): ?>
+ <meta itemprop="description" content="<?php echo esc_attr($description); ?>">
+<?php endif; ?>
+<?php if ($image_url): ?>
+ <meta itemprop="image" content="<?php echo esc_url($image_url); ?>">
+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <!-- Twitter Card data -->
</span><span class="cx"> <meta name="twitter:card" content="summary_large_image">
</span><span class="cx"> <meta name="twitter:site" content="@webkit">
</span><del>- <meta name="twitter:title" content="<?php the_title(); ?>">
- <meta name="twitter:description" content="<?php the_excerpt(); ?>">
- <?php if ( '' !== ( $twitter_handle = get_the_author_meta('twitter') ) ): ?>
- <meta name="twitter:creator" content="@<?php echo esc_html($twitter_handle); ?>">
- <?php endif; ?>
- <?php if ( $image_url ): // Twitter summary card with large image must be at least 280x150px ?>
- <meta name="twitter:image:src" content="<?php echo $image_url; ?>">
- <?php endif; ?>
</del><ins>+ <meta name="twitter:title" content="<?php echo esc_attr($title); ?>">
+<?php if ($description): ?>
+ <meta name="twitter:description" content="<?php echo esc_attr($description); ?>">
+<?php endif; ?>
+<?php if ($twitter_handle): ?>
+ <meta name="twitter:creator" content="@<?php echo esc_attr($twitter_handle); ?>">
+<?php endif; ?>
+<?php if ($image_url): // Twitter summary card with large image must be at least 280x150px ?>
+ <meta name="twitter:image:src" content="<?php echo esc_url($image_url); ?>">
+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <!-- Open Graph data -->
</span><del>- <meta property="og:title" content="<?php the_title(); ?>" />
- <meta property="og:type" content="article" />
</del><ins>+ <meta property="og:title" content="<?php echo esc_attr($title); ?>" />
+ <meta property="og:type" content="<?php echo esc_attr($type); ?>" />
</ins><span class="cx"> <meta property="og:url" content="<?php the_permalink(); ?>" />
</span><del>- <?php if ( $image_url ): ?>
- <meta itemprop="og:image" content="<?php echo $image_url; ?>">
- <?php endif; ?>
- <meta property="og:description" content="<?php the_excerpt(); ?>" />
</del><ins>+<?php if ($image_url): ?>
+ <meta itemprop="og:image" content="<?php echo esc_url($image_url); ?>">
+<?php endif; ?>
+<?php if ($description): ?>
+ <meta property="og:description" content="<?php echo esc_attr($description); ?>" />
+<?php endif; ?>
</ins><span class="cx"> <meta property="og:site_name" content="<?php bloginfo('title'); ?>" />
</span><span class="cx"> <meta property="article:published_time" content="<?php the_time('c'); ?>" />
</span><span class="cx"> <meta property="article:modified_time" content="<?php the_modified_date('c'); ?>" />
</span><del>- <?php
- $categories = wp_get_object_terms( get_the_ID(), 'category', array( 'fields' => 'names' ) );
- $tags = wp_get_object_terms( get_the_ID(), 'post_tag', array( 'fields' => 'names' ) );
-
- if ( ! empty($categories) ):
- $section = array_shift($categories); // The first category is used as the section
- $tags = array_merge($categories, $tags); // The rest are prepended to the tag list
- ?>
</del><ins>+<?php
+ if (!empty($categories)):
+ $section = array_shift($categories); // The first category is used as the section
+ $tags = array_merge($categories, $tags); // The rest are prepended to the tag list
+?>
</ins><span class="cx"> <meta property="article:section" content="<?php echo esc_attr($section); ?>" />
</span><del>- <?php
- endif;
</del><ins>+<?php
+ endif;
</ins><span class="cx">
</span><del>- if ( ! empty($tags) ): foreach( $tags as $tag ):
- ?>
</del><ins>+ if (!empty($tags)):
+ foreach($tags as $tag):
+?>
</ins><span class="cx"> <meta property="article:tag" content="<?php echo esc_attr($tag); ?>" />
</span><del>- <?php
- endforeach; endif;
- ?>
</del><ins>+<?php
+ endforeach;
+ endif;
+?>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> });
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>