<!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>[8375] sites/trunk/wordcamp.org/public_html/wp-content: WordCamp Post Type: Migrate `wpmu_new_blog` to `wp_initialize_site`.</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/8375">8375</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/8375","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>2019-02-28 20:22:40 +0000 (Thu, 28 Feb 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'>WordCamp Post Type: Migrate `wpmu_new_blog` to `wp_initialize_site`.
The old action is deprecated, per https://core.trac.wordpress.org/ticket/41333.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksnewsitesphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/new-sites.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampnewsitephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweaksnewsitesphp"></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/mu-plugins/jetpack-tweaks/new-sites.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/mu-plugins/jetpack-tweaks/new-sites.php 2019-02-28 15:34:07 UTC (rev 8374)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/new-sites.php 2019-02-28 20:22:40 UTC (rev 8375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,13 @@
</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\Jetpack_Tweaks;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WP_Site;
</ins><span class="cx" style="display: block; padding: 0 10px">
</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><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'jetpack_get_default_modules', __NAMESPACE__ . '\default_jetpack_modules' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_update_site_option_jetpack-network-settings', __NAMESPACE__ . '\auto_connect_new_sites', 10, 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wpmu_new_blog', __NAMESPACE__ . '\schedule_connect_new_site' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wp_initialize_site', __NAMESPACE__ . '\schedule_connect_new_site', 11 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wcorg_connect_new_site', __NAMESPACE__ . '\wcorg_connect_new_site', 10, 2 );
</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">@@ -39,13 +40,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Schedule an email asking to connect Jetpack to WordPress.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $blog_id The blog id.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Site $new_site
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function schedule_connect_new_site( $blog_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function schedule_connect_new_site( $new_site ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_single_event(
</span><span class="cx" style="display: block; padding: 0 10px"> time() + 12 * HOUR_IN_SECONDS + 600, // After the the SSL certificate has been installed
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcorg_connect_new_site_email',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( $blog_id, get_current_user_id() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( $new_site->blog_id, get_current_user_id() )
</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></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampnewsitephp"></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-new-site.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-new-site.php 2019-02-28 15:34:07 UTC (rev 8374)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php 2019-02-28 20:22:40 UTC (rev 8375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,10 +162,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = isset( $url_components['path'] ) ? $url_components['path'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_meta = get_post_custom( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $lead_organizer = $this->get_user_or_current_user( $wordcamp_meta['WordPress.org Username'][0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_meta = array( 'public' => 1 );
- $this->new_site_id = wpmu_create_blog( $url_components['host'], $path, 'WordCamp Event', $lead_organizer->ID, $site_meta );
- // todo can probably just set the final name here, rather than a generic one here and the final one in set_default_options()
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_name = apply_filters( 'the_title', $wordcamp->post_title );
+ if ( ! empty( $wordcamp->{'Start Date (YYYY-mm-dd)'} ) ) {
+ $blog_name .= date( ' Y', $wordcamp->{'Start Date (YYYY-mm-dd)'} );
+ }
+
+ $this->new_site_id = wp_insert_site( array(
+ 'domain' => $url_components['host'],
+ 'path' => $path,
+ 'title' => $blog_name,
+ 'user_id' => $lead_organizer->ID,
+ ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_int( $this->new_site_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $wordcamp_id, '_site_id', $this->new_site_id ); // this is used in other plugins to map the `wordcamp` post to it's corresponding site
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wcor_wordcamp_site_created', $wordcamp_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,13 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $coming_soon_settings = $WCCSP_Settings->get_settings();
</span><span class="cx" style="display: block; padding: 0 10px"> $coming_soon_settings['enabled'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_name = apply_filters( 'the_title', $wordcamp->post_title );
- if ( isset( $meta['Start Date (YYYY-mm-dd)'] ) && $meta['Start Date (YYYY-mm-dd)'][0] > 0 ) {
- $blog_name .= date( ' Y', $meta['Start Date (YYYY-mm-dd)'][0] );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> update_option( 'admin_email', $admin_email );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'blogname', $blog_name );
</del><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blogdescription', __( 'Just another WordCamp', 'wordcamporg' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'close_comments_for_old_posts', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'close_comments_days_old', 30 );
</span></span></pre>
</div>
</div>
</body>
</html>