Changeset 8375

Timestamp:

02/28/2019 08:22:40 PM (8 years ago)

Author:

iandunn

Message:

WordCamp Post Type: Migrate wpmu_new_blog to wp_initialize_site.

The old action is deprecated, per ​https://core.trac.wordpress.org/ticket/41333.

Location:

sites/trunk/wordcamp.org/public_html/wp-content

Files:

• mu-plugins/jetpack-tweaks/new-sites.php (modified) (3 diffs)
• plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/new-sites.php

@@ -2 +2 @@
 
 namespace WordCamp\Jetpack_Tweaks;
+use WP_Site;
 
 defined( 'WPINC' ) or die();
@@ -7 +8 @@
 add_filter( 'jetpack_get_default_modules',                     __NAMESPACE__ . '\default_jetpack_modules'       );
 add_filter( 'pre_update_site_option_jetpack-network-settings', __NAMESPACE__ . '\auto_connect_new_sites', 10, 2 );
-add_action( 'wpmu_new_blog',                                   __NAMESPACE__ . '\schedule_connect_new_site'     );
+add_action( 'wp_initialize_site',                              __NAMESPACE__ . '\schedule_connect_new_site', 11 );
 add_action( 'wcorg_connect_new_site',                          __NAMESPACE__ . '\wcorg_connect_new_site', 10, 2 );
 
@@ -40 +41 @@
  * Schedule an email asking to connect Jetpack to WordPress.com
  *
- * @param int $blog_id The blog id.
+ * @param WP_Site $new_site
  */
-function schedule_connect_new_site( $blog_id ) {
+function schedule_connect_new_site( $new_site ) {
         wp_schedule_single_event(
                 time() + 12 * HOUR_IN_SECONDS + 600, // After the the SSL certificate has been installed
                 'wcorg_connect_new_site_email',
-                array( $blog_id, get_current_user_id() )
+                array( $new_site->blog_id, get_current_user_id() )
         );
 }

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php

@@ -163 +163 @@
                 $wordcamp_meta     = get_post_custom( $wordcamp_id );
                 $lead_organizer    = $this->get_user_or_current_user( $wordcamp_meta['WordPress.org Username'][0] );
-                $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()
+
+                $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,
+                ) );
 
                 if ( is_int( $this->new_site_id ) ) {
@@ -392 +401 @@
                 $coming_soon_settings['enabled'] = 'on';
 
-                $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] );
-                }
-
                 update_option( 'admin_email',                  $admin_email );
-                update_option( 'blogname',                     $blog_name );
                 update_option( 'blogdescription',              __( 'Just another WordCamp', 'wordcamporg' ) );
                 update_option( 'close_comments_for_old_posts', 1 );