← All changes
|
app/modules/import-export-customization/processes/import.php
+3
-8
4.0.9
→
3.33.0-beta1
View file →
| @@ -18,9 +18,8 @@ | ||
| 18 | 18 | use Elementor\App\Modules\ImportExportCustomization\Runners\Import\Taxonomies; |
| 19 | 19 | use Elementor\App\Modules\ImportExportCustomization\Runners\Import\Templates; |
| 20 | 20 | use Elementor\App\Modules\ImportExportCustomization\Runners\Import\Wp_Content; |
| 21 | 21 | use Elementor\App\Modules\ImportExportCustomization\Module; |
| 22 | -use Elementor\App\Modules\ImportExportCustomization\Runners\Import\Floating_Elements; | |
| 23 | 22 | |
| 24 | 23 | class Import { |
| 25 | 24 | const MANIFEST_ERROR_KEY = 'manifest-error'; |
| 26 | 25 | |
| @@ -211,9 +210,8 @@ | ||
| 211 | 210 | |
| 212 | 211 | $this->manifest = $instance_data['manifest']; |
| 213 | 212 | $this->site_settings = $instance_data['site_settings']; |
| 214 | 213 | |
| 215 | - $this->kit_id = $instance_data['kit_id'] ?? ''; | |
| 216 | 214 | $this->settings_include = $instance_data['settings_include']; |
| 217 | 215 | $this->settings_referrer = $instance_data['settings_referrer']; |
| 218 | 216 | $this->settings_conflicts = $instance_data['settings_conflicts']; |
| 219 | 217 | $this->settings_selected_override_conditions = $instance_data['settings_selected_override_conditions']; |
| @@ -262,9 +260,8 @@ | ||
| 262 | 260 | $this->register( new Templates() ); |
| 263 | 261 | $this->register( new Taxonomies() ); |
| 264 | 262 | $this->register( new Elementor_Content() ); |
| 265 | 263 | $this->register( new Wp_Content() ); |
| 266 | - $this->register( new Floating_Elements() ); | |
| 267 | 264 | } |
| 268 | 265 | |
| 269 | 266 | /** |
| 270 | 267 | * Set default settings for the import. |
| @@ -417,18 +414,17 @@ | ||
| 417 | 414 | * @return void |
| 418 | 415 | */ |
| 419 | 416 | public function init_import_session( $save_instance_data = false ) { |
| 420 | 417 | $import_sessions = Utils::get_import_sessions( true ); |
| 421 | - $existing_session = $import_sessions[ $this->session_id ] ?? []; | |
| 422 | 418 | |
| 423 | 419 | $import_sessions[ $this->session_id ] = [ |
| 424 | 420 | 'session_id' => $this->session_id, |
| 425 | 421 | 'kit_title' => $this->manifest['title'] ?? '', |
| 426 | 422 | 'kit_name' => $this->manifest['name'] ?? '', |
| 427 | - 'kit_thumbnail' => $existing_session['kit_thumbnail'] ?? $this->get_kit_thumbnail(), | |
| 428 | - 'kit_source' => $existing_session['kit_source'] ?? $this->settings_referrer, | |
| 423 | + 'kit_thumbnail' => $this->get_kit_thumbnail(), | |
| 424 | + 'kit_source' => $this->settings_referrer, | |
| 429 | 425 | 'user_id' => get_current_user_id(), |
| 430 | - 'start_timestamp' => $existing_session['start_timestamp'] ?? current_time( 'timestamp' ), | |
| 426 | + 'start_timestamp' => current_time( 'timestamp' ), | |
| 431 | 427 | ]; |
| 432 | 428 | |
| 433 | 429 | if ( $save_instance_data ) { |
| 434 | 430 | $import_sessions[ $this->session_id ]['instance_data'] = [ |
| @@ -438,9 +434,8 @@ | ||
| 438 | 434 | |
| 439 | 435 | 'manifest' => $this->manifest, |
| 440 | 436 | 'site_settings' => $this->site_settings, |
| 441 | 437 | |
| 442 | - 'kit_id' => $this->kit_id, | |
| 443 | 438 | 'settings_include' => $this->settings_include, |
| 444 | 439 | 'settings_referrer' => $this->settings_referrer, |
| 445 | 440 | 'settings_conflicts' => $this->settings_conflicts, |
| 446 | 441 | 'settings_selected_override_conditions' => $this->settings_selected_override_conditions, |