<!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>[193387] 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/193387">193387</a></dd>
<dt>Author</dt> <dd>jond@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 16:23:09 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed transient behavior when the cache plugin is enabled.
* wp-content/themes/webkit/functions.php:
* wp-content/themes/webkit/includes.php:
* wp-content/themes/webkit/nightly.php:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsiteswebkitorgChangeLog">trunk/Websites/webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsiteswebkitorgwpcontentthemeswebkitfunctionsphp">trunk/Websites/webkit.org/wp-content/themes/webkit/functions.php</a></li>
<li><a href="#trunkWebsiteswebkitorgwpcontentthemeswebkitincludesphp">trunk/Websites/webkit.org/wp-content/themes/webkit/includes.php</a></li>
<li><a href="#trunkWebsiteswebkitorgwpcontentthemeswebkitnightlyphp">trunk/Websites/webkit.org/wp-content/themes/webkit/nightly.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 (193386 => 193387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/ChangeLog 2015-12-04 00:11:32 UTC (rev 193386)
+++ trunk/Websites/webkit.org/ChangeLog 2015-12-04 00:23:09 UTC (rev 193387)
</span><span class="lines">@@ -1,5 +1,13 @@
</span><span class="cx"> 2015-12-03 Jonathan Davis <jond@apple.com>
</span><span class="cx">
</span><ins>+ Fixed transient behavior when the cache plugin is enabled.
+
+ * wp-content/themes/webkit/functions.php:
+ * wp-content/themes/webkit/includes.php:
+ * wp-content/themes/webkit/nightly.php:
+
+2015-12-03 Jonathan Davis <jond@apple.com>
+
</ins><span class="cx"> Add sub-section anchors to code style guidelines
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151770
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsiteswebkitorgwpcontentthemeswebkitfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/wp-content/themes/webkit/functions.php (193386 => 193387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/wp-content/themes/webkit/functions.php 2015-12-04 00:11:32 UTC (rev 193386)
+++ trunk/Websites/webkit.org/wp-content/themes/webkit/functions.php 2015-12-04 00:23:09 UTC (rev 193387)
</span><span class="lines">@@ -92,6 +92,11 @@
</span><span class="cx"> return $content;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function is_super_cache_enabled() {
+ global $super_cache_enabled;
+ return (isset($super_cache_enabled) && true === $super_cache_enabled);
+}
+
</ins><span class="cx"> function tag_post_image_luminance( $post_id ) {
</span><span class="cx"> $threshold = 128;
</span><span class="cx"> $tags = array();
</span></span></pre></div>
<a id="trunkWebsiteswebkitorgwpcontentthemeswebkitincludesphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/wp-content/themes/webkit/includes.php (193386 => 193387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/wp-content/themes/webkit/includes.php 2015-12-04 00:11:32 UTC (rev 193386)
+++ trunk/Websites/webkit.org/wp-content/themes/webkit/includes.php 2015-12-04 00:23:09 UTC (rev 193387)
</span><span class="lines">@@ -5,16 +5,13 @@
</span><span class="cx"> ?>
</span><span class="cx"> <?php get_header(); ?>
</span><span class="cx">
</span><del>- <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-
- <?php
</del><ins>+ <?php if (have_posts()) : while (have_posts()) : the_post();
</ins><span class="cx">
</span><span class="cx"> $path = dirname(ABSPATH);
</span><span class="cx"> $file = get_post_meta(get_the_ID(), 'include-markdown', true);
</span><span class="cx">
</span><span class="cx"> $cachekey = "cached_include_" . $file;
</span><del>-
- if ( false === ( $content = get_transient($cachekey) ) ) {
</del><ins>+ if ( is_super_cache_enabled() || false === ( $content = get_transient($cachekey) ) ) {
</ins><span class="cx"> ob_start();
</span><span class="cx"> include $path . '/' . $file;
</span><span class="cx"> $content = ob_get_clean();
</span><span class="lines">@@ -32,24 +29,24 @@
</span><span class="cx"> set_transient($cachekey, $content, DAY_IN_SECONDS);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ?>
</del><ins>+ ?>
</ins><span class="cx">
</span><span class="cx"> <article class="page<?php if ( has_table_of_contents() ) echo ' with-toc';?>" id="post-<?php the_ID(); ?>">
</span><span class="cx">
</span><del>- <h1><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h1>
</del><ins>+ <h1><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h1>
</ins><span class="cx">
</span><del>- <div class="bodycopy">
</del><ins>+ <div class="bodycopy">
</ins><span class="cx"> <?php table_of_contents(); ?>
</span><span class="cx"> <?php
</span><span class="cx"> echo apply_filters('the_content', $content);
</span><span class="cx"> ?>
</span><del>- </div>
</del><ins>+ </div>
</ins><span class="cx"> </article>
</span><span class="cx">
</span><del>- <?php //comments_template(); ?>
</del><ins>+ <?php //comments_template(); ?>
</ins><span class="cx">
</span><del>- <?php endwhile; else:
</del><ins>+ <?php endwhile; else:
</ins><span class="cx"> include('444.php');
</span><del>- endif; ?>
</del><ins>+ endif; ?>
</ins><span class="cx">
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkWebsiteswebkitorgwpcontentthemeswebkitnightlyphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/wp-content/themes/webkit/nightly.php (193386 => 193387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/wp-content/themes/webkit/nightly.php 2015-12-04 00:11:32 UTC (rev 193386)
+++ trunk/Websites/webkit.org/wp-content/themes/webkit/nightly.php 2015-12-04 00:23:09 UTC (rev 193387)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> $type = $types[0];
</span><span class="cx">
</span><span class="cx"> $cachekey = 'nightly_download_' . $type;
</span><del>- if ( false !== ( $cached = get_transient($cachekey) ) )
</del><ins>+ if ( is_super_cache_enabled() || false !== ( $cached = get_transient($cachekey) ) )
</ins><span class="cx"> return json_decode($cached);
</span><span class="cx">
</span><span class="cx"> $url = sprintf(WEBKIT_NIGHTLY_ARCHIVE_URL, $type);
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty($data) ) {
</span><span class="cx"> $record = explode(',', $data);
</span><del>- set_transient($cachekey, json_encode($record), DAY_IN_SECONDS);
</del><ins>+ set_transient($cachekey, json_encode($record), HOUR_IN_SECONDS * 6); // Expire every 6 hours
</ins><span class="cx"> return $record;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>