v3.34.0

core/app/modules/import-export-customization/assets/js/components/kit-content-customization-dialog.js

@@ -413,7 +413,7 @@ export function KitContentCustomizationDialog( {
 							<SubSetting
 								key={ taxonomy.value }
 								label={ taxonomy.label }
-								settingKey="taxonomies"
+								settingKey={ `taxonomies_${ taxonomy.value }` }
 								checked={ settings.taxonomies.includes( taxonomy.value ) }
 								disabled={ ! isHighTier() }
 								tooltip={ ! isHighTier() }

core/app/modules/import-export-customization/assets/js/components/kit-settings-customization-dialog.js

@@ -224,6 +224,7 @@ export function KitSettingsCustomizationDialog( {
 										checked={ settings.customCode }
 										disabled={ ( isImport && ! data?.uploadedData?.manifest?.[ 'custom-code' ] ) || ! isHighTier() }
 										tooltip={ ! isHighTier() }
+										notExported={ isImport && ! data?.uploadedData?.manifest?.[ 'custom-code' ] }
 									/>
 								</Stack>
 							</SettingSection>

core/app/modules/import-export-customization/runners/import/site-settings.php

@@ -68,7 +68,11 @@ class Site_Settings extends Import_Runner_Base {
 		$new_kit = Plugin::elementor()->kits_manager->create_new_kit( $title, $new_site_settings );
 		$this->imported_kit_id = (int) $new_kit;
 
-		$result['site-settings'] = (bool) $new_kit;
+		$result['site-settings']['imported_kit_id'] = $this->imported_kit_id;
+
+		foreach ( $new_site_settings as $key => $value ) {
+			$result['site-settings'][ $key ] = $value;
+		}
 
 		if ( $customization['theme'] ?? false ) {
 			$import_theme_result = $runner->import_theme( $data );

core/app/modules/import-export-customization/runners/import/taxonomies.php

@@ -12,7 +12,7 @@ class Taxonomies extends Import_Runner_Base {
 	public function handle( $result, array $data, array $imported_data, array $customization, $runner ) {
 		$path = $data['extracted_directory_path'] . 'taxonomies/';
 		$this->import_session_id = $data['session_id'];
-		$selected_taxonomies = $data['selected_taxonomies'] ?? [];
+		$selected_taxonomies = $customization['taxonomies'] ?? [];
 
 		$wp_builtin_post_types = ImportExportUtils::get_builtin_wp_post_types();
 		$selected_custom_post_types = isset( $data['selected_custom_post_types'] ) ? $data['selected_custom_post_types'] : [];

core/database/model-query-builder.php

@@ -26,7 +26,7 @@ class Model_Query_Builder extends Query_Builder {
 	 * @param string $model_classname - Model to use inside the builder.
 	 * @param \wpdb|null $connection - MySQL connection.
 	 */
-	public function __construct( $model_classname, \wpdb $connection = null ) {
+	public function __construct( $model_classname, ?\wpdb $connection = null ) {
 		$this->set_model( $model_classname );
 
 		parent::__construct( $connection );

core/database/query-builder.php

@@ -134,7 +134,7 @@ class Query_Builder {
 	 *
 	 * @param \wpdb|null $connection - The Mysql connection instance to use.
 	 */
-	public function __construct( \wpdb $connection = null ) {
+	public function __construct( ?\wpdb $connection = null ) {
 		if ( $connection ) {
 			$this->connection = $connection;
 			return;
@@ -265,7 +265,7 @@ class Query_Builder {
 	 *
 	 * @return $this
 	 */
-	public function when( $condition, callable $true_callback, callable $false_callback = null ) {
+	public function when( $condition, callable $true_callback, ?callable $false_callback = null ) {
 		if ( $condition ) {
 			call_user_func( $true_callback, $this, $condition );
 		} elseif ( $false_callback instanceof \Closure ) {

core/modules-manager.php

@@ -32,12 +32,14 @@ final class Modules_Manager {
 			'admin-top-bar',
 			'notes',
 			'announcements',
-			'display-conditions',
 			'element-manager',
 			'checklist',
 
 			// Modules with Widgets.
 			'attributes',
+			'atomic-widgets',
+			'display-conditions',
+			'transitions',
 			'theme-builder',
 			'loop-builder',
 			'off-canvas',