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

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