<!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>[8753] sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017: Revert "WC Campsite17: Content option support ..." SVN r8748</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/8753">8753</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/8753","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>vedjain</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-08 20:52:56 +0000 (Wed, 08 May 2019)</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'>Revert "WC Campsite17: Content option support ..." SVN <a href="http://meta.trac.wordpress.org/changeset/8748">r8748</a>
This is causing a bug where sponsor images are not displayed, because of (lilkely) Jetpack interfering with featured image output when content options are disabled. This featured image output is getting used by sponsor shortcode.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemescampsite2017incjetpackphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/inc/jetpack.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemescampsite2017templatepartscontentpagephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content-page.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemescampsite2017templatepartscontentsearchphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content-search.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemescampsite2017templatepartscontentphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemescampsite2017incjetpackphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/inc/jetpack.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/inc/jetpack.php 2019-05-08 19:47:26 UTC (rev 8752)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/inc/jetpack.php 2019-05-08 20:52:56 UTC (rev 8753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Jetpack setup function.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * See: https://jetpack.com/support/infinite-scroll/
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * See: https://jetpack.com/support/content-options/
</del><span class="cx" style="display: block; padding: 0 10px"> * See: https://jetpack.com/support/responsive-videos/
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function jetpack_setup() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,22 +27,6 @@
</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">- $featured_image_enabled = ! wcorg_skip_feature( 'cs17_display_featured_image' );
- add_theme_support(
- 'jetpack-content-options',
- array(
- 'featured-images' => array(
- 'archive' => true,
- 'archive-default' => $featured_image_enabled,
- 'post' => true,
- 'post-default' => $featured_image_enabled,
- 'page' => true,
- 'page-default' => $featured_image_enabled,
- 'fallback' => false,
- ),
- )
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'jetpack-responsive-videos' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemescampsite2017templatepartscontentpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content-page.php 2019-05-08 19:47:26 UTC (rev 8752)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content-page.php 2019-05-08 20:52:56 UTC (rev 8753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,12 +13,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( has_post_thumbnail() ) : ?>
- <div class="entry-image">
- <?php the_post_thumbnail(); ?>
- </div>
- <?php endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemescampsite2017templatepartscontentsearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content-search.php 2019-05-08 19:47:26 UTC (rev 8752)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content-search.php 2019-05-08 20:52:56 UTC (rev 8753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,12 +13,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( has_post_thumbnail() ) : ?>
- <div class="entry-image">
- <?php the_post_thumbnail(); ?>
- </div>
- <?php endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'post' === get_post_type() ) : ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemescampsite2017templatepartscontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content.php 2019-05-08 19:47:26 UTC (rev 8752)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/campsite-2017/template-parts/content.php 2019-05-08 20:52:56 UTC (rev 8753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,12 +15,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( has_post_thumbnail() ) : ?>
- <div class="entry-image">
- <?php the_post_thumbnail(); ?>
- </div>
- <?php endif;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( is_single() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> the_title( '<h1 class="entry-title">', '</h1>' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>