← All changes | app/Modules/ModuleManager.php +5 -29 2.1.2 → 2.0.0 View file →

		@@ -12,19 +12,16 @@
12	12	use SingletonTrait;
13	13
14	14	private $module_list;
15	15
16		- private $module_instances = array();
17	16	private function __construct() {
18	17	add_action( 'init', [ $this, 'load_modules' ], 15 );
19	18	}
20	19
21	20	public function load_modules() {
22		- if ( ! is_null( $this->module_list ) ) {
23		- return;
24		- }
25		- $this->module_list = ModuleList::instance()->get_list( true, 'active' );
26		- foreach ( $this->module_list as $module ) {
	21	+
	22	+ foreach ( ModuleList::instance()->get_list( true, 'active' ) as $module ) {
	23	+
27	24	if ( isset( $module['active'] ) && $module['active'] !== 'on' ) {
28	25	continue;
29	26	}
30	27
		@@ -31,33 +28,12 @@
31	28	if ( ! empty( $module['package'] ) && $module['package'] === 'pro-disabled' ) {
32	29	continue;
33	30	}
34	31
35		- if ( ! isset( $module['base_class'] ) ) {
36		- continue;
	32	+ if ( isset( $module['base_class'] ) && class_exists( $module['base_class'] ) ) {
	33	+ $module['base_class']::instance();
37	34	}
38	35
39		- if ( isset( $this->module_instances[ $module['base_class'] ] ) ) {
40		- continue;
41		- }
42		-
43		- if ( ! class_exists( $module['base_class'] ) ) {
44		- continue;
45		- }
46		-
47		- // Check if the instance is already in the cache
48		- $cached_instance = wp_cache_get( $module['base_class'], 'module_instances' );
49		- if ( false === $cached_instance ) {
50		- // Create an instance and store it in the cache
51		- $this->module_instances[ $module['base_class'] ] = $module['base_class']::instance();
52		- wp_cache_set( $module['base_class'], $this->module_instances[ $module['base_class'] ], 'module_instances' );
53		- } else {
54		- // Use the cached instance
55		- $this->module_instances[ $module['base_class'] ] = $cached_instance;
56		- }
57		-
58	36	}
59	37
60	38	}
61		-
62		-
63	39	}