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

Do not require pluggable.php [MAILPOET-1650]

Browse Source
This commit is contained in:
wxa
2018-11-22 17:01:33 +03:00
parent 012dc25a5b
commit 467bef1d61
12 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/JSON/v1/Newsletters.php
View File

@ -25,8 +25,6 @@ use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Newsletters extends APIEndpoint { class Newsletters extends APIEndpoint {
public $permissions = array( public $permissions = array(
'global' => AccessControl::PERMISSION_MANAGE_EMAILS 'global' => AccessControl::PERMISSION_MANAGE_EMAILS

1
lib/Config/AccessControl.php
View File

@ -5,7 +5,6 @@ namespace MailPoet\Config;
use MailPoet\WP\Hooks as WPHooks; use MailPoet\WP\Hooks as WPHooks;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class AccessControl { class AccessControl {
const PERMISSION_ACCESS_PLUGIN_ADMIN = 'mailpoet_access_plugin_admin'; const PERMISSION_ACCESS_PLUGIN_ADMIN = 'mailpoet_access_plugin_admin';

1
lib/Cron/Daemon.php
View File

@ -9,7 +9,6 @@ use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck as PremiumKeyCheckWorker;
use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck as SendingServiceKeyCheckWorker; use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck as SendingServiceKeyCheckWorker;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Daemon { class Daemon {
public $timer; public $timer;

1
lib/Cron/DaemonHttpRunner.php
View File

@ -2,7 +2,6 @@
namespace MailPoet\Cron; namespace MailPoet\Cron;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class DaemonHttpRunner { class DaemonHttpRunner {
public $settings_daemon_data; public $settings_daemon_data;

1
lib/Cron/Workers/Scheduler.php
View File

@ -16,7 +16,6 @@ use MailPoet\Newsletter\Scheduler\Scheduler as NewsletterScheduler;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Scheduler { class Scheduler {
public $timer; public $timer;

1
lib/Mailer/Mailer.php
View File

@ -9,7 +9,6 @@ use MailPoet\Mailer\Methods\ErrorMappers\SMTPMapper;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Mailer { class Mailer {
public $mailer_config; public $mailer_config;

3
lib/Newsletter/Shortcodes/Categories/Newsletter.php
View File

@ -6,7 +6,6 @@ use MailPoet\Models\Newsletter as NewsletterModel;
use MailPoet\WP\Posts as WPPosts; use MailPoet\WP\Posts as WPPosts;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . "wp-includes/pluggable.php");
class Newsletter { class Newsletter {
static function process( static function process(
@ -57,4 +56,4 @@ class Newsletter {
$posts->posts[0]->to_array() : $posts->posts[0]->to_array() :
false; false;
} }
} }

1
lib/Newsletter/Shortcodes/Categories/Subscriber.php
View File

@ -5,7 +5,6 @@ use MailPoet\Models\Subscriber as SubscriberModel;
use MailPoet\Models\SubscriberCustomField; use MailPoet\Models\SubscriberCustomField;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Subscriber { class Subscriber {
static function process( static function process(

2
lib/Router/Endpoints/ViewInBrowser.php
View File

@ -11,8 +11,6 @@ use MailPoet\Newsletter\ViewInBrowser as NewsletterViewInBrowser;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class ViewInBrowser { class ViewInBrowser {
const ENDPOINT = 'view_in_browser'; const ENDPOINT = 'view_in_browser';
const ACTION_VIEW = 'view'; const ACTION_VIEW = 'view';

2
lib/Segments/WP.php
View File

@ -10,8 +10,6 @@ use MailPoet\Subscribers\Source;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class WP { class WP {
static function synchronizeUser($wp_user_id, $old_wp_user_data = false) { static function synchronizeUser($wp_user_id, $old_wp_user_data = false) {
$wp_user = \get_userdata($wp_user_id); $wp_user = \get_userdata($wp_user_id);

3
lib/Util/Security.php
View File

@ -2,7 +2,6 @@
namespace MailPoet\Util; namespace MailPoet\Util;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-includes/pluggable.php');
class Security { class Security {
const HASH_LENGTH = 12; const HASH_LENGTH = 12;
@ -32,4 +31,4 @@ class Security {
$length $length
); );
} }
} }

1
tests/integration/Newsletter/ShortcodesTest.php
View File

@ -12,7 +12,6 @@ use MailPoet\Newsletter\Shortcodes\Categories\Date;
use MailPoet\Newsletter\Url as NewsletterUrl; use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Subscription\Url as SubscriptionUrl; use MailPoet\Subscription\Url as SubscriptionUrl;
require_once(ABSPATH . 'wp-includes/pluggable.php');
require_once(ABSPATH . 'wp-admin/includes/user.php'); require_once(ABSPATH . 'wp-admin/includes/user.php');
class ShortcodesTest extends \MailPoetTest { class ShortcodesTest extends \MailPoetTest {