Skip to content

Commit 0246b15

Browse files
committed
plugin loading optimized
1 parent 3b1444d commit 0246b15

37 files changed

+293
-230
lines changed

cbxtaxonomy.php

Lines changed: 53 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,50 +28,79 @@
2828
*/
2929

3030
// If this file is called directly, abort.
31-
if (!defined('WPINC')) {
31+
if ( ! defined( 'WPINC' ) ) {
3232
die;
3333
}
3434

35-
defined('CBXTAXONOMY_PLUGIN_NAME') or define('CBXTAXONOMY_PLUGIN_NAME', 'cbxtaxonomy');
36-
defined('CBXTAXONOMY_PLUGIN_VERSION') or define('CBXTAXONOMY_PLUGIN_VERSION', '1.0.0');
37-
defined('CBXTAXONOMY_BASE_NAME') or define('CBXTAXONOMY_BASE_NAME', plugin_basename(__FILE__));
38-
defined('CBXTAXONOMY_ROOT_PATH') or define('CBXTAXONOMY_ROOT_PATH', plugin_dir_path(__FILE__));
39-
defined('CBXTAXONOMY_ROOT_URL') or define('CBXTAXONOMY_ROOT_URL', plugin_dir_url(__FILE__));
40-
defined('CBXTAXONOMY_DEV_MODE') or define('CBXTAXONOMY_DEV_MODE', true);
35+
use Cbx\Taxonomy\CBXTaxonomyHelper;
4136

42-
require_once CBXTAXONOMY_ROOT_PATH . "lib/autoload.php";
37+
defined( 'CBXTAXONOMY_PLUGIN_NAME' ) or define( 'CBXTAXONOMY_PLUGIN_NAME', 'cbxtaxonomy' );
38+
defined( 'CBXTAXONOMY_PLUGIN_VERSION' ) or define( 'CBXTAXONOMY_PLUGIN_VERSION', '1.0.0' );
39+
defined( 'CBXTAXONOMY_BASE_NAME' ) or define( 'CBXTAXONOMY_BASE_NAME', plugin_basename( __FILE__ ) );
40+
defined( 'CBXTAXONOMY_ROOT_PATH' ) or define( 'CBXTAXONOMY_ROOT_PATH', plugin_dir_path( __FILE__ ) );
41+
defined( 'CBXTAXONOMY_ROOT_URL' ) or define( 'CBXTAXONOMY_ROOT_URL', plugin_dir_url( __FILE__ ) );
42+
defined( 'CBXTAXONOMY_DEV_MODE' ) or define( 'CBXTAXONOMY_DEV_MODE', true );
4343

44-
register_activation_hook(__FILE__, 'activate_cbxtaxonomy');
45-
register_deactivation_hook(__FILE__, 'deactivate_cbxtaxonomy');
44+
// Include the main ComfortResume class.
45+
if ( ! class_exists( 'CBXTaxonomy', false ) ) {
46+
include_once CBXTAXONOMY_ROOT_PATH . 'includes/CBXTaxonomy.php';
47+
}
48+
49+
//require_once CBXTAXONOMY_ROOT_PATH . "lib/autoload.php";
50+
51+
register_activation_hook( __FILE__, 'activate_cbxtaxonomy' );
52+
register_deactivation_hook( __FILE__, 'deactivate_cbxtaxonomy' );
4653

4754
/**
4855
* * The code that runs during plugin activation.
4956
* The code that runs during plugin deactivation.
5057
*/
51-
function activate_cbxtaxonomy()
52-
{
53-
\Cbx\Taxonomy\CBXTaxonomyHelper::load_orm();
54-
\Cbx\Taxonomy\CBXTaxonomyHelper::active_plugin();
58+
function activate_cbxtaxonomy() {
59+
cbxtaxonomy();
60+
61+
CBXTaxonomyHelper::load_orm();
62+
CBXTaxonomyHelper::active_plugin();
5563
}
5664

5765
/**
5866
* The code that runs during plugin deactivation.
5967
*/
60-
function deactivate_cbxtaxonomy()
61-
{
62-
\Cbx\Taxonomy\CBXTaxonomyHelper::load_orm();
68+
function deactivate_cbxtaxonomy() {
69+
cbxtaxonomy();
70+
71+
CBXTaxonomyHelper::load_orm();
6372
}
6473

6574

6675
/**
67-
* Init cbxtaxonomy plugin
76+
* Returns the main instance of CBXTaxonomy.
77+
*
78+
* @since 1.0
6879
*/
69-
function cbxtaxonomy()
70-
{
71-
if (defined('CBXTAXONOMY_PLUGIN_NAME')) {
72-
\Cbx\Taxonomy\CBXTaxonomy::instance();
80+
function cbxtaxonomy() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
81+
global $cbxtaxonomy;
82+
83+
// If the global variable is not already set, initialize it
84+
if ( ! isset( $cbxtaxonomy ) ) {
85+
$cbxtaxonomy = run_cbxtaxonomy();
7386
}
74-
}//end function cbxtaxonomy
7587

76-
add_action('plugins_loaded', 'cbxtaxonomy');
88+
return $cbxtaxonomy;
89+
}//end function cbxtaxonomy_core
90+
91+
/**
92+
* Initialize ComfortResume pro plugin
93+
* @since 1.0.0
94+
*/
95+
function run_cbxtaxonomy() {
96+
return CBXTaxonomy::instance();
97+
}//end function run_cbxtaxonomy
98+
99+
/**
100+
* Init cbxtaxonomy plugin
101+
*/
102+
function cbxtaxonomy_init() {
103+
$GLOBALS['cbxtaxonomy'] = run_cbxtaxonomy();
104+
}//end function cbxtaxonomy_init
77105

106+
add_action( 'plugins_loaded', 'cbxtaxonomy_init' );

0 commit comments

Comments
 (0)