<!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>[4398] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-site-cloner/includes/source-site-id-setting.php: Site Cloner: prepend Remote CSS rules to Custom CSS stylesheet</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/4398">4398</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/4398","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-22 00:12:31 +0000 (Tue, 22 Nov 2016)</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'>Site Cloner: prepend Remote CSS rules to Custom CSS stylesheet
Check the source site for a cached version of a Remote CSS stylesheet
and combine it with any Jetpack Custom CSS before applying to the
recipient site.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1113">#1113</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampsiteclonerincludessourcesiteidsettingphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-site-cloner/includes/source-site-id-setting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampsiteclonerincludessourcesiteidsettingphp"></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/plugins/wordcamp-site-cloner/includes/source-site-id-setting.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/plugins/wordcamp-site-cloner/includes/source-site-id-setting.php 2016-11-21 22:25:27 UTC (rev 4397)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-site-cloner/includes/source-site-id-setting.php 2016-11-22 00:12:31 UTC (rev 4398)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Site_Cloner;
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use \WordCamp\RemoteCSS;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Customizer Setting for source site ID
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +49,13 @@
</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"> switch_to_blog( $this->preview_source_site_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( '<style id="wcsc-source-site-custom-css">%s</style>', \Jetpack_Custom_CSS::get_css( true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ printf(
+ '<style id="wcsc-source-site-custom-css">%s %s</style>',
+ $this->get_cached_remote_css(),
+ \Jetpack_Custom_CSS::get_css( true )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,6 +114,33 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the cached remote CSS for the current blog.
+ *
+ * @return string
+ */
+ public function get_cached_remote_css() {
+ $remote_css = '';
+
+ if ( ! function_exists( '\WordCamp\RemoteCSS\get_safe_css_post' ) ) {
+ return $remote_css;
+ }
+
+ $post = RemoteCSS\get_safe_css_post();
+
+ if ( $post instanceof \WP_Post ) {
+ // Sanitization copied from \Jetpack_Custom_CSS::get_css()
+ // so that there is parity with how Jetpack outputs the CSS
+ $remote_css = str_replace(
+ array( '\\\00BB \\\0020', '\0BB \020', '0BB 020' ),
+ '\00BB \0020',
+ $post->post_content_filtered
+ );
+ }
+
+ return $remote_css;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Clone the source site into the current site
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If the theme needs to be switched, Core will do that for us because we added the `?theme=` parameter
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +158,33 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_site_css = \Jetpack_Custom_CSS::get_css( false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_site_css = '';
+
+ // Add Remote CSS first
+ // This maintains the correct cascading order of stylesheet rules
+ if ( $remote_css = $this->get_cached_remote_css() ) {
+ $source_site_css .= sprintf(
+ "/* %s */\n%s\n\n",
+ sprintf(
+ esc_html__( 'Remote CSS from %s', 'wordcamporg' ),
+ esc_url( get_option( 'wcrcss_remote_css_url' ) )
+ ),
+ $remote_css
+ );
+ }
+
+ // Add Jetpack Custom CSS second
+ if ( $custom_css = \Jetpack_Custom_CSS::get_css( false ) ) {
+ $source_site_css .= sprintf(
+ "/* %s */\n%s\n\n",
+ sprintf(
+ esc_html__( 'Custom CSS from %s', 'wordcamporg' ),
+ get_bloginfo( 'name' )
+ ),
+ $custom_css
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $source_site_preprocessor = get_post_meta( $source_cite_css_post['ID'], 'custom_css_preprocessor', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $source_site_mode = get_post_meta( $source_cite_css_post['ID'], 'custom_css_add', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $source_site_content_width = get_post_meta( $source_cite_css_post['ID'], 'content_width', true );
</span></span></pre>
</div>
</div>
</body>
</html>