diff --git a/lib/Config/Changelog.php b/lib/Config/Changelog.php index 7c0b61a1f9..58358386f4 100644 --- a/lib/Config/Changelog.php +++ b/lib/Config/Changelog.php @@ -36,7 +36,13 @@ class Changelog { if($version === null) { // new install - $redirect_url = admin_url('admin.php?page=mailpoet-welcome'); + $mp2_migrator = new MP2Migrator(); + if($mp2_migrator->isMigrationNeeded()) { + // Migration from MP2 + $redirect_url = admin_url('admin.php?page=mailpoet-migration'); + } else { + $redirect_url = admin_url('admin.php?page=mailpoet-welcome'); + } } else if($version !== Env::$version) { // update $redirect_url = admin_url('admin.php?page=mailpoet-update'); diff --git a/lib/Config/MP2Migrator.php b/lib/Config/MP2Migrator.php index 7c7a9bdb47..db53840809 100644 --- a/lib/Config/MP2Migrator.php +++ b/lib/Config/MP2Migrator.php @@ -143,6 +143,8 @@ class MP2Migrator { $this->importCustomFields(); $this->importSubscribers(); + Setting::setValue('mailpoet_migration_complete', true); + $this->log(sprintf('=== ' . __('END IMPORT', 'mailpoet') . ' %s ===', $datetime->formatTime(time(), \MailPoet\WP\DateTime::DEFAULT_DATE_TIME_FORMAT))); $result = ob_get_contents(); ob_clean(); diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 6a01dd20eb..9b62cafcf3 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -1,7 +1,6 @@ setPageTitle(__('Migration', 'mailpoet')), + '', + Env::$required_permission, + 'mailpoet-migration', + array( + $this, + 'migration' + ) + ); + add_submenu_page( true, $this->setPageTitle(__('Update', 'mailpoet')), @@ -271,25 +282,23 @@ class Menu { $redirect_url = admin_url('admin.php?page=mailpoet-newsletters'); } - $mp2_migrator = new MP2Migrator(); - if($mp2_migrator->isMigrationNeeded()) { - $mp2_migrator->init(); - $data = array( - 'log_file_url' => $mp2_migrator->log_file_url, - 'progress_url' => $mp2_migrator->progressbar->url, - ); - $this->displayPage('mp2migration.html', $data); - - } else { + $data = array( + 'settings' => Setting::getAll(), + 'current_user' => wp_get_current_user(), + 'redirect_url' => $redirect_url, + 'sub_menu' => 'mailpoet-newsletters' + ); + $this->displayPage('welcome.html', $data); + } - $data = array( - 'settings' => Setting::getAll(), - 'current_user' => wp_get_current_user(), - 'redirect_url' => $redirect_url, - 'sub_menu' => 'mailpoet-newsletters' - ); - $this->displayPage('welcome.html', $data); - } + function migration() { + $mp2_migrator = new MP2Migrator(); + $mp2_migrator->init(); + $data = array( + 'log_file_url' => $mp2_migrator->log_file_url, + 'progress_url' => $mp2_migrator->progressbar->url, + ); + $this->displayPage('mp2migration.html', $data); } function update() {