<!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>[4577] sites/trunk/wordcamp.org/public_html/wp-content/plugins: WordCamp Site Cloner: Refactor for compatibility with WP 4.7 and Jetpack 4.2.2</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/4577">4577</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/4577","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>2016-12-23 17:27:38 +0000 (Fri, 23 Dec 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'>WordCamp Site Cloner: Refactor for compatibility with WP 4.7 and Jetpack 4.2.2
WordPress 4.7 added a Customizer feature that allows editing CSS. Jetpack 4.2.2 replaced the Custom CSS module with an entirely new one that is compatible with the Customizer feature, but broke backwards-compatibility with the Site Cloner and Remote CSS plugins.
This commit refactors the Site Cloner to restore compatibility with Jetpack, and add support for the new Core feature.
https://make.wordpress.org/core/2016/10/11/feature-proposal-better-theme-customizations-via-custom-css-with-live-previews/
https://make.wordpress.org/core/2016/11/26/extending-the-custom-css-editor/
https://github.com/Automattic/jetpack/issues/5539
https://github.com/Automattic/jetpack/pull/5804
https://core.trac.wordpress.org/ticket/35395
https://core.trac.wordpress.org/ticket/38672
https://core.trac.wordpress.org/ticket/39270</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</a></li>
<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>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampsiteclonerwordcampsiteclonerphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-site-cloner/wordcamp-site-cloner.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp"></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/wcpt/wcpt-wordcamp/wordcamp-admin.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/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-12-23 17:27:34 UTC (rev 4576)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-12-23 17:27:38 UTC (rev 4577)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,6 +720,9 @@
</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"> if ( $old_status == 'wcpt-pre-planning' && $new_status == 'wcpt-pre-planning' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo - bug: this won't ever run b/c of the early return above.
+ // what commit made this mistake, and why?
+ // what things are tied to this that haven't been running?
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wcpt_added_to_planning_schedule', $post );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $old_status == 'wcpt-needs-schedule' && $new_status == 'wcpt-scheduled' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wcpt_added_to_final_schedule', $post );
</span></span></pre></div>
<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-12-23 17:27:34 UTC (rev 4576)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-site-cloner/includes/source-site-id-setting.php 2016-12-23 17:27:38 UTC (rev 4577)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,16 +1,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Site_Cloner;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use \WordCamp\RemoteCSS;
+use Jetpack_Custom_CSS_Enhancements;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</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"> /**
</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="cx" style="display: block; padding: 0 10px"> * This isn't an actual setting that gets stored in the database, it's just a temporary value to track the ID of
</span><span class="cx" style="display: block; padding: 0 10px"> * the site that that will be cloned. There are actually many data points that we'll import, but they don't fit
</span><span class="cx" style="display: block; padding: 0 10px"> * into the default model that the Customizer expects.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @todo - We may no longer need a setting; see https://make.wordpress.org/core/2016/03/10/customizer-improvements-in-4-5/
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Source_Site_ID_Setting extends \WP_Customize_Setting {
</span><span class="cx" style="display: block; padding: 0 10px"> public $type = 'wcsc-source-site-id';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,87 +31,47 @@
</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"> add_action( 'wp_head', array( $this, 'preview_source_site_css' ), 99 ); // wp_print_styles is too early; the theme's stylesheet would get enqueued later and take precedence
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'get_post_metadata', array( $this, 'preview_jetpack_postmeta' ), 10, 4 );
- add_filter( 'safecss_skip_stylesheet', array( $this, 'preview_skip_stylesheet' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'safecss_skip_stylesheet', array( $this, 'preview_skip_stylesheet' ), 15 ); // After Jetpack_Custom_CSS_Enhancements::preview_skip_stylesheet()
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Disable the current site's Custom CSS from being output
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'wp_head', array( 'Jetpack_Custom_CSS', 'link_tag' ), 101 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_action( 'wp_head', 'wp_custom_css_cb', 11 ); // todo compat with WP 4.7. this line can be removed when r39616 is merged to the 4.7 branch
+ remove_action( 'wp_head', 'wp_custom_css_cb', 101 );
</ins><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><span class="cx" style="display: block; padding: 0 10px"> * Print the source site's custom CSS in an inline style block
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * It can't be easily enqueued as an external stylesheet because Jetpack_Custom_CSS::link_tag() returns early
- * in the Customizer if the theme being previewed is different from the live theme.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function preview_source_site_css() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( method_exists( '\Jetpack', 'get_module_path' ) ) {
- require_once( \Jetpack::get_module_path( 'custom-css' ) );
- } else {
- return;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $this->preview_source_site_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<style id="wcsc-source-site-custom-css">%s %s</style>',
</span><span class="cx" style="display: block; padding: 0 10px"> $this->get_cached_remote_css(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- \Jetpack_Custom_CSS::get_css( true )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_get_custom_css()
</ins><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"> 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="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Overwrite the previewing site's Custom CSS settings with values from the source site
- *
- * @param mixed $pre_filter_value
- * @param int $post_id
- * @param string $meta_key
- * @param bool $return_single_value
- *
- * @return mixed
- */
- public function preview_jetpack_postmeta( $pre_filter_value, $post_id, $meta_key, $return_single_value ) {
- if ( ! in_array( $meta_key, array( 'content_width' ) ) ) {
- return $pre_filter_value;
- }
-
- remove_filter( 'get_post_metadata', array( $this, 'preview_jetpack_postmeta' ), 10, 4 ); // avoid infinite recursion
- switch_to_blog( $this->preview_source_site_id );
-
- if ( $source_cite_css_post = \Jetpack_Custom_CSS::get_current_revision() ) {
- $pre_filter_value = get_post_meta( $source_cite_css_post['ID'], $meta_key, $return_single_value );
- }
-
- restore_current_blog();
- add_filter( 'get_post_metadata', array( $this, 'preview_jetpack_postmeta' ), 10, 4 );
-
- return $pre_filter_value;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Determine whether or not to skip the primary stylesheet
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When the Custom CSS value for `Mode` is `Replacement`, Jetpack will prevent the primary stylesheet from
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When the `Start Fresh` theme mod is set, Jetpack will prevent the primary stylesheet from
</ins><span class="cx" style="display: block; padding: 0 10px"> * being enqueued. We need to trigger that behavior based on the value on the source site, rather than the
</span><span class="cx" style="display: block; padding: 0 10px"> * current site.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This could be actually handled along with other Jetpack options in preview_jetpack_postmeta(), if it
- * weren't for the fact that Jetpack_Custom_CSS::skip_stylesheet always returns false in the Previewer.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param bool $skip
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function preview_skip_stylesheet( $skip ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'safecss_skip_stylesheet', array( $this, 'preview_skip_stylesheet' ), 15 ); // Avoid infinite recursion. Also, use same priority as originally set in preview()
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $this->preview_source_site_id );
</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 ( $source_cite_css_post = \Jetpack_Custom_CSS::get_current_revision() ) {
- $skip = 'no' === get_post_meta( $source_cite_css_post['ID'], 'custom_css_add', true );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $skip = Jetpack_Custom_CSS_Enhancements::skip_stylesheet();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'safecss_skip_stylesheet', array( $this, 'preview_skip_stylesheet' ), 15 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $skip;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_css = str_replace(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '\\\00BB \\\0020', '\0BB \020', '0BB 020' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '\00BB \0020',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post->post_content_filtered
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post->post_content
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,11 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function update( $source_site_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $source_site_id );
</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 ( ! $source_cite_css_post = \Jetpack_Custom_CSS::get_current_revision() ) {
- restore_current_blog();
- return;
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_site_theme_mods = get_theme_mod( 'jetpack_custom_css' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $source_site_css = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add Remote CSS first
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,30 +132,32 @@
</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">- // Add Jetpack Custom CSS second
- if ( $custom_css = \Jetpack_Custom_CSS::get_css( false ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Add Core Custom CSS second to maintain correct cascading order.
+ *
+ * Processed CSS and vanilla CSS are stored in `post_content`, but pre-processed CSS is stored in
+ * `post_content_filtered`.
+ */
+ if ( $custom_css_post = wp_get_custom_css_post() ) {
+ if ( empty( $source_site_theme_mods['preprocessor'] ) ) {
+ $custom_css = $custom_css_post->post_content;
+ } else {
+ $custom_css = $custom_css_post->post_content_filtered;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $source_site_css .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> "/* %s */\n%s\n\n",
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html__( 'Custom CSS from %s', 'wordcamporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_bloginfo( 'name' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parse_url( home_url(), PHP_URL_HOST )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_css
</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">- $source_site_preprocessor = get_post_meta( $source_cite_css_post['ID'], 'custom_css_preprocessor', true );
- $source_site_mode = get_post_meta( $source_cite_css_post['ID'], 'custom_css_add', true );
- $source_site_content_width = get_post_meta( $source_cite_css_post['ID'], 'content_width', true );
-
</del><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- \Jetpack_Custom_CSS::save( array(
- 'css' => $source_site_css,
- 'is_preview' => false,
- 'preprocessor' => $source_site_preprocessor,
- 'add_to_existing' => 'yes' === $source_site_mode ? true : false,
- 'content_width' => $source_site_content_width,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_custom_css_post( $source_site_css );
+ set_theme_mod( 'jetpack_custom_css', $source_site_theme_mods );
</ins><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_htmlwpcontentpluginswordcampsiteclonerwordcampsiteclonerphp"></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/wordcamp-site-cloner.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/wordcamp-site-cloner.php 2016-12-23 17:27:34 UTC (rev 4576)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-site-cloner/wordcamp-site-cloner.php 2016-12-23 17:27:38 UTC (rev 4577)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,13 +269,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme_mods = get_option( 'theme_mods_' . get_stylesheet() );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Sites with Coming Soon enabled probably don't have a finished design yet, so there's no point in
</span><span class="cx" style="display: block; padding: 0 10px"> * cloning it.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! coming_soon_plugin_enabled() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preprocessor = \Jetpack_Custom_CSS::get_preprocessor();
- $preprocessor = isset( $preprocessor[ 'name' ] ) ? $preprocessor[ 'name' ] : 'none';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preprocessor = isset( $theme_mods['jetpack_custom_css']['preprocessor'] ) ? $theme_mods['jetpack_custom_css']['preprocessor'] : 'none';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sites[ $site_id ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $site_id,
</span></span></pre>
</div>
</div>
</body>
</html>