<!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>[192884] 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/192884">192884</a></dd>
<dt>Author</dt> <dd>jond@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 09:34:39 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed data return format for tweets when updating cache.
* wp-content/themes/webkit/widgets/twitter.php:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsiteswebkitorgChangeLog">trunk/Websites/webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsiteswebkitorgwpcontentthemeswebkitwidgetstwitterphp">trunk/Websites/webkit.org/wp-content/themes/webkit/widgets/twitter.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 (192883 => 192884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/ChangeLog 2015-12-01 17:31:29 UTC (rev 192883)
+++ trunk/Websites/webkit.org/ChangeLog 2015-12-01 17:34:39 UTC (rev 192884)
</span><span class="lines">@@ -1,5 +1,11 @@
</span><span class="cx"> 2015-12-01 Jonathan Davis <jond@apple.com>
</span><span class="cx">
</span><ins>+ Fixed data return format for tweets when updating cache.
+
+ * wp-content/themes/webkit/widgets/twitter.php:
+
+2015-12-01 Jonathan Davis <jond@apple.com>
+
</ins><span class="cx"> Theme update to tidy styles and add a theme screenshot.
</span><span class="cx">
</span><span class="cx"> * wp-content/themes/webkit/screenshot.png: Added.
</span></span></pre></div>
<a id="trunkWebsiteswebkitorgwpcontentthemeswebkitwidgetstwitterphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/wp-content/themes/webkit/widgets/twitter.php (192883 => 192884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/wp-content/themes/webkit/widgets/twitter.php 2015-12-01 17:31:29 UTC (rev 192883)
+++ trunk/Websites/webkit.org/wp-content/themes/webkit/widgets/twitter.php 2015-12-01 17:34:39 UTC (rev 192884)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> extract($args, EXTR_SKIP);
</span><span class="cx">
</span><span class="cx"> $Tweet = $this->tweet();
</span><ins>+
</ins><span class="cx"> // Show "Follow @webkit" instead of tweet for empty text
</span><span class="cx"> if ( empty($Tweet) || empty($Tweet->text) )
</span><span class="cx"> return $this->follow_markup($options);
</span><span class="lines">@@ -36,13 +37,13 @@
</span><span class="cx"> && preg_match('!webkit.org/blog/\d+/!', $Tweet->entities->urls[0]->expanded_url) == 1)
</span><span class="cx"> return $this->follow_markup($options);
</span><span class="cx">
</span><del>- $text = $Tweet->text;
-
</del><span class="cx"> $classes = array('tile', 'third-tile', 'twitter-tile');
</span><span class="cx">
</span><del>- if ( empty($text) && ! empty($options['text']) )
- $text = (string)$options['text'];
</del><ins>+ $text = (string)$options['text'];
</ins><span class="cx">
</span><ins>+ if ( ! empty($Tweet->text) )
+ $text = $Tweet->text;
+
</ins><span class="cx"> if ( ! empty($options['url']) )
</span><span class="cx"> $url = (string)$options['url'];
</span><span class="cx">
</span><span class="lines">@@ -123,9 +124,8 @@
</span><span class="cx"> $oauth_consumer_key_secret = 'mLuYD3AjUehUZKOgQIICA5Na69te45aSJTkdIDTGSg4cfHd6Lz';
</span><span class="cx"> $oauth_token = '14315023-7pHbcI5bk2QZhNiHR9uFudaksBzMPubEuOEmYj7YQ';
</span><span class="cx"> $oauth_token_secret = '0K9T9znxG4S9PUGunYZ5LwyKL9AR6v3eAXp6WKY2oi7Bg';
</span><del>- $oauth_nonce = '492f1766207b56aa04bcea8e969dc1f5'; //sha1(rand() . time());
- $oauth_signature = '-------------------';
</del><span class="cx"> $oauth_timestamp = time();
</span><ins>+ $oauth_nonce = sha1(rand() . $oauth_timestamp);
</ins><span class="cx">
</span><span class="cx"> $fields = array(
</span><span class="cx"> 'oauth_consumer_key' => $oauth_consumer_key,
</span><span class="lines">@@ -171,14 +171,14 @@
</span><span class="cx"> $options['headers'] = $headers;
</span><span class="cx">
</span><span class="cx"> $response = wp_remote_get($endpoint, $options);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_a($response, 'WP_Error') )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( 200 == $response['response']['code'] && ! empty($response['body']) ) {
</span><span class="cx"> $data = json_decode($response['body'])[0];
</span><span class="cx"> set_transient(self::CACHEKEY, json_encode($data), DAY_IN_SECONDS/2);
</span><del>- return json_decode($data);
</del><ins>+ return $data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>