← All changes | app/Modules/ModuleManager.php +8 -44 3.4.2 → 2.0.2 View file →

		@@ -1,49 +1,27 @@
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;
	7	+
8	8	use RadiusTheme\SB\Traits\SingletonTrait;
9	9
10		-/**
11		- * Module Manager class.
12		- *
13		- * Handles loading and instantiation of all plugin modules.
14		- */
15	10	class ModuleManager {
16	11
17	12	use SingletonTrait;
18	13
19		- /**
20		- * Module list.
21		- *
22		- * @var array|null
23		- */
24	14	private $module_list;
25	15
26		- /**
27		- * Module instances.
28		- *
29		- * @var array
30		- */
31		- private $module_instances = [];
32		-
33		- /**
34		- * Constructor.
35		- */
36	16	private function __construct() {
37	17	add_action( 'init', [ $this, 'load_modules' ], 15 );
38	18	}
39	19
40	20	public function load_modules() {
41		- if ( ! is_null( $this->module_list ) ) {
42		- return;
43		- }
44		- $this->module_list = ModuleList::instance()->get_list( true, 'active' );
45		- foreach ( $this->module_list as $module ) {
	21	+
	22	+ foreach ( ModuleList::instance()->get_list( true, 'active' ) as $module ) {
	23	+
46	24	if ( isset( $module['active'] ) && $module['active'] !== 'on' ) {
47	25	continue;
48	26	}
49	27
		@@ -50,26 +28,12 @@
50	28	if ( ! empty( $module['package'] ) && $module['package'] === 'pro-disabled' ) {
51	29	continue;
52	30	}
53	31
54		- if ( ! isset( $module['base_class'] ) ) {
55		- continue;
	32	+ if ( isset( $module['base_class'] ) && class_exists( $module['base_class'] ) ) {
	33	+ $module['base_class']::instance();
56	34	}
57	35
58		- if ( isset( $this->module_instances[ $module['base_class'] ] ) ) {
59		- continue;
60		- }
	36	+ }
61	37
62		- if ( ! class_exists( $module['base_class'] ) ) {
63		- continue;
64		- }
65		-
66		- try {
67		- $module['base_class']::instance();
68		- } catch ( \Throwable $e ) {
69		- error_log( 'ShopBuilder module error (' . $module['base_class'] . '): ' . $e->getMessage() ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
70		- continue;
71		- }
72		-
73		- }
74	38	}
75		-}
	39	+}