Fixes #118: On multisite-convert, don't assume site_id is 1 (#122)

Fixes #118: On multisite-convert, don't assume site_id is 1

Author: schlessera

src/Core_Command.php

@@ -660,6 +660,9 @@ private function multisite_convert_( $assoc_args ) {
 			$assoc_args['subdomains']
 		);
 
+		$site_id = $wpdb->get_var( "SELECT id FROM $wpdb->site" );
+		$site_id = ( null === $site_id ) ? 1 : (int) $site_id;
+
 		if ( true === $result ) {
 			WP_CLI::log( 'Set up multisite database tables.' );
 		} elseif ( is_wp_error( $result ) ) {
@@ -691,7 +694,7 @@ private function multisite_convert_( $assoc_args ) {
 \$base = '{$assoc_args['base']}';
 define( 'DOMAIN_CURRENT_SITE', '{$domain}' );
 define( 'PATH_CURRENT_SITE', '{$assoc_args['base']}' );
-define( 'SITE_ID_CURRENT_SITE', 1 );
+define( 'SITE_ID_CURRENT_SITE', {$site_id} );
 define( 'BLOG_ID_CURRENT_SITE', 1 );
 EOT;