<!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>[4781] sites/trunk/wordcamp.org/public_html/wp-content/themes: WordCamp Base: Replace get_output_mode() with skip_stylesheet() to avoid bug</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" 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/4781">4781</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/4781","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-25 13:28:50 +0000 (Wed, 25 Jan 2017)</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'>WordCamp Base: Replace get_output_mode() with skip_stylesheet() to avoid bug
Previously (in <a href="http://meta.trac.wordpress.org/changeset/4590">r4590</a>), Remote CSS's `get_output_mode()` was used, because it just pulls the theme mod setting directly, which is nice because it doesn't require Jetpack's Custom CSS module to be active on the site. That led to a bug where sometimes the CSS being output in the Site Cloner preview was wrong, though. If the target site has `replace` mode on, and the source site didn't, then the source site's theme stylesheet would be removed, because the Base theme didn't realize that it should be checking the mode on the target site, rather than the source site. Switching to `skip_stylesheet()` fixes that, since the `Source_Site_ID_Setting::preview_skip_stylesheet` hooks into the process and switches to the target site when the value is being pulled. Fixing that far outweighs the benefit of not requiring Custom CSS to be active.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbstructurephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-structure.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbstructurephp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012functionsphp">sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbaselibstructureclasswcbstructurephp"></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/wordcamp-base/lib/structure/class-wcb-structure.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/wordcamp-base/lib/structure/class-wcb-structure.php 2017-01-25 13:28:45 UTC (rev 4780)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-structure.php 2017-01-25 13:28:50 UTC (rev 4781)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,5 @@
</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">-use WordCamp\RemoteCSS;
-
</del><span class="cx" style="display: block; padding: 0 10px"> class WCB_Structure extends WCB_Loader {
</span><span class="cx" style="display: block; padding: 0 10px"> var $body;
</span><span class="cx" style="display: block; padding: 0 10px"> var $sidebars;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,10 +41,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $grid = wcb_get_option('grid');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't output CSS if Jetpack Custom CSS/RemoteCSS is set to 'replace' mode
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'replace' === RemoteCSS\get_output_mode() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( JETPACK__PLUGIN_DIR . '/modules/custom-css/custom-css-4.7.php' );
+ if ( Jetpack_Custom_CSS_Enhancements::skip_stylesheet() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ // todo - this filter is not used anywhere and can be removed. Custom CSS and Remote CSS have options for this instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> $start_fresh = apply_filters( 'wcb_start_fresh', false );
</span><span class="cx" style="display: block; padding: 0 10px"> $child_recs = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampbasev2libstructureclasswcbstructurephp"></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/wordcamp-base-v2/lib/structure/class-wcb-structure.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/wordcamp-base-v2/lib/structure/class-wcb-structure.php 2017-01-25 13:28:45 UTC (rev 4780)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php 2017-01-25 13:28:50 UTC (rev 4781)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,5 @@
</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">-use WordCamp\RemoteCSS;
-
</del><span class="cx" style="display: block; padding: 0 10px"> class WCB_Structure extends WCB_Loader {
</span><span class="cx" style="display: block; padding: 0 10px"> var $body;
</span><span class="cx" style="display: block; padding: 0 10px"> var $sidebars;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,10 +41,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $grid = wcb_get_option('grid');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't output CSS if Jetpack Custom CSS/RemoteCSS is set to 'replace' mode
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'replace' === RemoteCSS\get_output_mode() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( JETPACK__PLUGIN_DIR . '/modules/custom-css/custom-css-4.7.php' );
+ if ( Jetpack_Custom_CSS_Enhancements::skip_stylesheet() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ // todo - this filter is not used anywhere and can be removed. Custom CSS and Remote CSS have options for this instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> $start_fresh = apply_filters( 'wcb_start_fresh', false );
</span><span class="cx" style="display: block; padding: 0 10px"> $child_recs = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentthemeswordcampcentral2012functionsphp"></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/wordcamp-central-2012/functions.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/wordcamp-central-2012/functions.php 2017-01-25 13:28:45 UTC (rev 4780)
+++ sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-central-2012/functions.php 2017-01-25 13:28:50 UTC (rev 4781)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,6 +825,7 @@
</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"> // Count the number of cities
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo use _venue_city field since it'll be more accurate, but need to populate older camps first
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wordcamps->posts as $wordcamp ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_post_meta( $wordcamp->ID, 'URL', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>