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

- Moves plugin initialization into a separate file that's included after

Browse Source 
PHP version and core dependency checks are run
This commit is contained in:
Vlad
2017-01-23 09:03:07 -05:00
parent cb5b0bd753
commit 9c35eb9723
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Config/Initializer.php
View File

@ -10,15 +10,6 @@ use MailPoet\WP\Notice as WPNotice;
if(!defined('ABSPATH')) exit;
require_once(ABSPATH . 'wp-admin/includes/plugin.php');
require_once(MAILPOET_PATH . '/vendor/autoload.php');
$initializer = new Initializer(
array(
'file' => MAILPOET_FILENAME,
'version' => MAILPOET_VERSION
)
);
$initializer->init();
class Initializer {

9
mailpoet.php
View File

@ -24,8 +24,8 @@ $mailpoet_plugin = array(
'version' => '3.0.0-beta.14',
'filename' => __FILE__,
'path' => dirname(__FILE__),
'loader' => dirname(__FILE__) . '/vendor/autoload.php',
'initializer' => dirname(__FILE__) . '/lib/Config/Initializer.php'
'autoloader' => dirname(__FILE__) . '/vendor/autoload.php',
'initializer' => dirname(__FILE__) . '/mailpoet_initializer.php'
);
// Check for the minimum PHP version
@ -50,7 +50,7 @@ if(version_compare(phpversion(), '5.3.0', '<')) {
}
// Check for core dependencies
if(!file_exists($mailpoet_plugin['loader']) && !file_exists($mailpoet_plugin['initializer'])) {
if(!file_exists($mailpoet_plugin['autoloader']) && !file_exists($mailpoet_plugin['initializer'])) {
add_action('admin_notices', function() {
$notice = __('MailPoet cannot start because it is missing core files. Please reinstall the plugin.', 'mailpoet');
printf('<div class="error"><p>%1$s</p></div>', $notice);
@ -59,7 +59,4 @@ if(!file_exists($mailpoet_plugin['loader']) && !file_exists($mailpoet_plugin['in
}
// Initialize the plugin
define('MAILPOET_VERSION', $mailpoet_plugin['version']);
define('MAILPOET_FILENAME', $mailpoet_plugin['filename']);
define('MAILPOET_PATH', $mailpoet_plugin['path']);
require_once($mailpoet_plugin['initializer']);

17
mailpoet_initializer.php Normal file
View File

@ -0,0 +1,17 @@
<?php
use MailPoet\Config\Initializer;
if(!defined('ABSPATH') || empty($mailpoet_plugin)) exit;
require_once($mailpoet_plugin['autoloader']);
define('MAILPOET_VERSION', $mailpoet_plugin['version']);
$initializer = new Initializer(
array(
'file' => $mailpoet_plugin['filename'],
'version' => $mailpoet_plugin['version']
)
);
$initializer->init();