← All changes
|
app/modules/import-export/processes/revert.php
+9
-12
4.1.0-dev2
→
3.13.2
View file →
| @@ -8,9 +8,8 @@ | ||
| 8 | 8 | use Elementor\App\Modules\ImportExport\Runners\Revert\Site_Settings; |
| 9 | 9 | use Elementor\App\Modules\ImportExport\Runners\Revert\Taxonomies; |
| 10 | 10 | use Elementor\App\Modules\ImportExport\Runners\Revert\Templates; |
| 11 | 11 | use Elementor\App\Modules\ImportExport\Runners\Revert\Wp_Content; |
| 12 | -use Elementor\App\Modules\ImportExport\Utils; | |
| 13 | 12 | |
| 14 | 13 | class Revert { |
| 15 | 14 | |
| 16 | 15 | /** |
| @@ -21,8 +20,11 @@ | ||
| 21 | 20 | private $import_sessions; |
| 22 | 21 | |
| 23 | 22 | private $revert_sessions; |
| 24 | 23 | |
| 24 | + /** | |
| 25 | + * @throws \Exception | |
| 26 | + */ | |
| 25 | 27 | public function __construct() { |
| 26 | 28 | $this->import_sessions = self::get_import_sessions(); |
| 27 | 29 | $this->revert_sessions = self::get_revert_sessions(); |
| 28 | 30 | } |
| @@ -54,32 +56,27 @@ | ||
| 54 | 56 | if ( empty( $this->runners ) ) { |
| 55 | 57 | throw new \Exception( 'Couldn’t execute the revert process because no revert runners have been specified. Try again by specifying revert runners.' ); |
| 56 | 58 | } |
| 57 | 59 | |
| 58 | - $import_session = $this->get_last_import_session(); | |
| 60 | + $data = $this->get_last_import_session(); | |
| 59 | 61 | |
| 60 | - if ( empty( $import_session ) ) { | |
| 62 | + if ( empty( $data ) ) { | |
| 61 | 63 | throw new \Exception( 'Couldn’t execute the revert process because there are no import sessions to revert.' ); |
| 62 | 64 | } |
| 63 | 65 | |
| 64 | - // fallback if the import session failed and doesn't have the runners metadata | |
| 65 | - if ( ! isset( $import_session['runners'] ) && isset( $import_session['instance_data'] ) ) { | |
| 66 | - $import_session['runners'] = $import_session['instance_data']['runners_import_metadata'] ?? []; | |
| 67 | - } | |
| 68 | - | |
| 69 | 66 | foreach ( $this->runners as $runner ) { |
| 70 | - if ( $runner->should_revert( $import_session ) ) { | |
| 71 | - $runner->revert( $import_session ); | |
| 67 | + if ( $runner->should_revert( $data ) ) { | |
| 68 | + $runner->revert( $data ); | |
| 72 | 69 | } |
| 73 | 70 | } |
| 74 | 71 | |
| 75 | - $this->revert_attachments( $import_session ); | |
| 72 | + $this->revert_attachments( $data ); | |
| 76 | 73 | |
| 77 | 74 | $this->delete_last_import_data(); |
| 78 | 75 | } |
| 79 | 76 | |
| 80 | 77 | public static function get_import_sessions() { |
| 81 | - $import_sessions = Utils::get_import_sessions(); | |
| 78 | + $import_sessions = get_option( Module::OPTION_KEY_ELEMENTOR_IMPORT_SESSIONS ); | |
| 82 | 79 | |
| 83 | 80 | if ( ! $import_sessions ) { |
| 84 | 81 | return []; |
| 85 | 82 | } |