Fix minor PR remarks [MAILPOET-2015]

Reuse updateCaptcha() function
Inject Captcha class using DI
Add no-cache headers to captcha image
Fix an error when accessing the captcha page directly
Edit the line in settings regarding missing dependencies
This commit is contained in:
wxa
2019-07-11 13:42:47 +03:00
committed by M. Shull
parent 0b8dbf1d27
commit 7788aebe83
12 changed files with 54 additions and 22 deletions

View File

@ -6,8 +6,9 @@ use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\WP\Functions as WPFunctions;
use MailPoet\Config\AccessControl;
use MailPoet\Config\Activator;
use MailPoet\Settings\SettingsController;
use MailPoet\Config\Populator;
use MailPoet\Settings\SettingsController;
use MailPoet\Subscription\Captcha;
if (!defined('ABSPATH')) exit;
@ -24,7 +25,8 @@ class Setup extends APIEndpoint {
function reset() {
try {
$settings = new SettingsController();
$activator = new Activator($settings, new Populator($settings, $this->wp));
$captcha = new Captcha();
$activator = new Activator($settings, new Populator($settings, $this->wp, $captcha));
$activator->deactivate();
$activator->activate();
$this->wp->doAction('mailpoet_setup_reset');