From 23eb4633c4116837ff2a1c9f01ce7ea6171b5af0 Mon Sep 17 00:00:00 2001 From: stoletniy Date: Mon, 2 Oct 2017 15:44:06 +0300 Subject: [PATCH] Remove the check for a plugin update permission [MAILPOET-1130] --- lib/Config/AccessControl.php | 8 -------- lib/Config/Initializer.php | 3 --- tests/unit/Config/AccessControlTest.php | 12 ------------ 3 files changed, 23 deletions(-) diff --git a/lib/Config/AccessControl.php b/lib/Config/AccessControl.php index 4ea3ff331b..e0f7412a09 100644 --- a/lib/Config/AccessControl.php +++ b/lib/Config/AccessControl.php @@ -14,7 +14,6 @@ class AccessControl { const PERMISSION_MANAGE_SUBSCRIBERS = 'mailpoet_manage_subscribers'; const PERMISSION_MANAGE_FORMS = 'mailpoet_manage_forms'; const PERMISSION_MANAGE_SEGMENTS = 'mailpoet_manage_segments'; - const PERMISSION_UPDATE_PLUGIN = 'mailpoet_update_plugin'; const NO_ACCESS_RESTRICTION = 'mailpoet_no_access_restriction'; public $permissions; @@ -67,12 +66,6 @@ class AccessControl { 'administrator' ) ), - self::PERMISSION_UPDATE_PLUGIN => WPHooks::applyFilters( - 'mailpoet_permission_update_plugin', - array( - 'administrator' - ) - ), ); } @@ -84,7 +77,6 @@ class AccessControl { self::PERMISSION_MANAGE_SUBSCRIBERS => __('Manage subscribers', 'mailpoet'), self::PERMISSION_MANAGE_FORMS => __('Manage forms', 'mailpoet'), self::PERMISSION_MANAGE_SEGMENTS => __('Manage segments', 'mailpoet'), - self::PERMISSION_UPDATE_PLUGIN => __('Update plugin', 'mailpoet'), ); } diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php index 95fa7a93a8..f9250dd858 100644 --- a/lib/Config/Initializer.php +++ b/lib/Config/Initializer.php @@ -153,9 +153,6 @@ class Initializer { // if current db version and plugin version differ if(version_compare($current_db_version, Env::$version) !== 0) { - if(!$this->access_control->validatePermission(AccessControl::PERMISSION_UPDATE_PLUGIN)) { - throw new \Exception(__('You do not have permission to activate/deactivate MailPoet plugin.', 'mailpoet')); - } $this->runActivator(); } } diff --git a/tests/unit/Config/AccessControlTest.php b/tests/unit/Config/AccessControlTest.php index 1196d13fae..3538090712 100644 --- a/tests/unit/Config/AccessControlTest.php +++ b/tests/unit/Config/AccessControlTest.php @@ -29,9 +29,6 @@ class AccessControlTest extends \MailPoetTest { AccessControl::PERMISSION_MANAGE_SEGMENTS => array( 'administrator' ), - AccessControl::PERMISSION_UPDATE_PLUGIN => array( - 'administrator' - ) ); $access_control = new AccessControl(); expect($access_control->permissions)->equals($default_permissions); @@ -74,12 +71,6 @@ class AccessControlTest extends \MailPoetTest { return array('custom_manage_segments_role'); } ); - Hooks::addFilter( - 'mailpoet_permission_update_plugin', - function() { - return array('custom_update_plugin_role'); - } - ); $access_control = new AccessControl(); expect($access_control->permissions)->equals( @@ -102,9 +93,6 @@ class AccessControlTest extends \MailPoetTest { AccessControl::PERMISSION_MANAGE_SEGMENTS => array( 'custom_manage_segments_role' ), - AccessControl::PERMISSION_UPDATE_PLUGIN => array( - 'custom_update_plugin_role' - ), ) ); }