← All changes | app/Modules/ModuleManager.php +7 -20 2.1.14 → 2.0.2 View file →

		@@ -1,8 +1,7 @@
1	1	<?php
2	2
3	3	namespace RadiusTheme\SB\Modules;
4		-
5	4	defined( 'ABSPATH' ) || exit();
6	5
7	6	use RadiusTheme\SB\Models\ModuleList;
8	7
		@@ -13,19 +12,16 @@
13	12	use SingletonTrait;
14	13
15	14	private $module_list;
16	15
17		- private $module_instances = [];
18	16	private function __construct() {
19	17	add_action( 'init', [ $this, 'load_modules' ], 15 );
20	18	}
21	19
22	20	public function load_modules() {
23		- if ( ! is_null( $this->module_list ) ) {
24		- return;
25		- }
26		- $this->module_list = ModuleList::instance()->get_list( true, 'active' );
27		- foreach ( $this->module_list as $module ) {
	21	+
	22	+ foreach ( ModuleList::instance()->get_list( true, 'active' ) as $module ) {
	23	+
28	24	if ( isset( $module['active'] ) && $module['active'] !== 'on' ) {
29	25	continue;
30	26	}
31	27
		@@ -32,21 +28,12 @@
32	28	if ( ! empty( $module['package'] ) && $module['package'] === 'pro-disabled' ) {
33	29	continue;
34	30	}
35	31
36		- if ( ! isset( $module['base_class'] ) ) {
37		- continue;
	32	+ if ( isset( $module['base_class'] ) && class_exists( $module['base_class'] ) ) {
	33	+ $module['base_class']::instance();
38	34	}
39	35
40		- if ( isset( $this->module_instances[ $module['base_class'] ] ) ) {
41		- continue;
42		- }
	36	+ }
43	37
44		- if ( ! class_exists( $module['base_class'] ) ) {
45		- continue;
46		- }
47		-
48		- $module['base_class']::instance();
49		-
50		- }
51	38	}
52		-}
	39	+}