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

Remove the check for a plugin update permission [MAILPOET-1130]

Browse Source
This commit is contained in:
stoletniy
2017-10-02 15:44:06 +03:00
parent 92dbf966a1
commit 23eb4633c4
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Config/AccessControl.php
View File

@ -14,7 +14,6 @@ class AccessControl {
const PERMISSION_MANAGE_SUBSCRIBERS = 'mailpoet_manage_subscribers'; const PERMISSION_MANAGE_SUBSCRIBERS = 'mailpoet_manage_subscribers';
const PERMISSION_MANAGE_FORMS = 'mailpoet_manage_forms'; const PERMISSION_MANAGE_FORMS = 'mailpoet_manage_forms';
const PERMISSION_MANAGE_SEGMENTS = 'mailpoet_manage_segments'; const PERMISSION_MANAGE_SEGMENTS = 'mailpoet_manage_segments';
const PERMISSION_UPDATE_PLUGIN = 'mailpoet_update_plugin';
const NO_ACCESS_RESTRICTION = 'mailpoet_no_access_restriction'; const NO_ACCESS_RESTRICTION = 'mailpoet_no_access_restriction';
public $permissions; public $permissions;
@ -67,12 +66,6 @@ class AccessControl {
'administrator' '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_SUBSCRIBERS => __('Manage subscribers', 'mailpoet'),
self::PERMISSION_MANAGE_FORMS => __('Manage forms', 'mailpoet'), self::PERMISSION_MANAGE_FORMS => __('Manage forms', 'mailpoet'),
self::PERMISSION_MANAGE_SEGMENTS => __('Manage segments', 'mailpoet'), self::PERMISSION_MANAGE_SEGMENTS => __('Manage segments', 'mailpoet'),
self::PERMISSION_UPDATE_PLUGIN => __('Update plugin', 'mailpoet'),
); );
} }

3
lib/Config/Initializer.php
View File

@ -153,9 +153,6 @@ class Initializer {
// if current db version and plugin version differ // if current db version and plugin version differ
if(version_compare($current_db_version, Env::$version) !== 0) { 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(); $this->runActivator();
} }
} }

12
tests/unit/Config/AccessControlTest.php
View File

@ -29,9 +29,6 @@ class AccessControlTest extends \MailPoetTest {
AccessControl::PERMISSION_MANAGE_SEGMENTS => array( AccessControl::PERMISSION_MANAGE_SEGMENTS => array(
'administrator' 'administrator'
), ),
AccessControl::PERMISSION_UPDATE_PLUGIN => array(
'administrator'
)
); );
$access_control = new AccessControl(); $access_control = new AccessControl();
expect($access_control->permissions)->equals($default_permissions); expect($access_control->permissions)->equals($default_permissions);
@ -74,12 +71,6 @@ class AccessControlTest extends \MailPoetTest {
return array('custom_manage_segments_role'); return array('custom_manage_segments_role');
} }
); );
Hooks::addFilter(
'mailpoet_permission_update_plugin',
function() {
return array('custom_update_plugin_role');
}
);
$access_control = new AccessControl(); $access_control = new AccessControl();
expect($access_control->permissions)->equals( expect($access_control->permissions)->equals(
@ -102,9 +93,6 @@ class AccessControlTest extends \MailPoetTest {
AccessControl::PERMISSION_MANAGE_SEGMENTS => array( AccessControl::PERMISSION_MANAGE_SEGMENTS => array(
'custom_manage_segments_role' 'custom_manage_segments_role'
), ),
AccessControl::PERMISSION_UPDATE_PLUGIN => array(
'custom_update_plugin_role'
),
) )
); );
} }