Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove inactive subscribers notice feature flag

Browse Source 
[MAILPOET-2161]
This commit is contained in:
Pavel Dohnal
2019-07-08 13:39:23 +02:00
committed by M. Shull
parent b4bebb24a9
commit 887757cf93
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Features/FeaturesController.php
View File

@ -10,14 +10,12 @@ class FeaturesController {
// const FEATURE_NAME_OF_FEATURE = 'name-of-feature';
const FEATURE_DISPLAY_WOOCOMMERCE_REVENUES = 'display-woocommerce-revenues'; // may also have 'display_revenues' setting
const FEATURE_ABANDONED_SHOPPING_CART = 'abandoned-shopping-cart';
const FEATURE_INACTIVE_SUBSCRIBERS_NOTICE = 'inactive-subscribers-notice';
// Define feature defaults in the array below in the following form:
// self::FEATURE_NAME_OF_FEATURE => true,
private $defaults = [
self::FEATURE_DISPLAY_WOOCOMMERCE_REVENUES => false,
self::FEATURE_ABANDONED_SHOPPING_CART => false,
self::FEATURE_INACTIVE_SUBSCRIBERS_NOTICE => false,
];
/** @var array */

10
lib/Util/Notices/PermanentNotices.php
View File

@ -3,7 +3,6 @@
namespace MailPoet\Util\Notices;
use MailPoet\Config\Menu;
use MailPoet\Features\FeaturesController;
use MailPoet\Settings\SettingsController;
use MailPoet\WP\Functions as WPFunctions;
@ -30,10 +29,7 @@ class PermanentNotices {
/** @var InactiveSubscribersNotice */
private $inactive_subscribers_notice;
/** @var FeaturesController */
private $features_controller;
public function __construct(WPFunctions $wp, FeaturesController $features_controller) {
public function __construct(WPFunctions $wp) {
$this->wp = $wp;
$this->php_version_warnings = new PHPVersionWarnings();
$this->after_migration_notice = new AfterMigrationNotice();
@ -41,7 +37,6 @@ class PermanentNotices {
$this->unauthorized_emails_notice = new UnauthorizedEmailNotice(new SettingsController, $wp);
$this->unauthorized_emails_in_newsletters_notice = new UnauthorizedEmailInNewslettersNotice(new SettingsController, $wp);
$this->inactive_subscribers_notice = new InactiveSubscribersNotice(new SettingsController, $wp);
$this->features_controller = $features_controller;
}
public function init() {
@ -64,8 +59,7 @@ class PermanentNotices {
Menu::isOnMailPoetAdminPage($exclude = null, $page_id = 'mailpoet-newsletters')
);
$this->inactive_subscribers_notice->init(
$this->features_controller->isSupported(FeaturesController::FEATURE_INACTIVE_SUBSCRIBERS_NOTICE)
&& Menu::isOnMailPoetAdminPage($exclude = ['mailpoet-welcome-wizard'])
Menu::isOnMailPoetAdminPage($exclude = ['mailpoet-welcome-wizard'])
);
$this->discounts_announcement->init(
empty($_GET['page'])