|
@@ -17,7 +17,7 @@ discard block |
|
|
block discarded – undo |
|
17
|
17
|
* |
|
18
|
18
|
* @return object[] |
|
19
|
19
|
*/ |
|
20
|
|
- function &objects_pool ($update_objects_pool = null) { |
|
|
20
|
+ function &objects_pool($update_objects_pool = null) { |
|
21
|
21
|
static $objects_pool = []; |
|
22
|
22
|
if (is_array($update_objects_pool)) { |
|
23
|
23
|
$objects_pool = $update_objects_pool; |
|
@@ -72,11 +72,11 @@ discard block |
|
|
block discarded – undo |
|
72
|
72
|
* Try to load classes from different places. If not found in one place - try in another. |
|
73
|
73
|
*/ |
|
74
|
74
|
if ( |
|
75
|
|
- _require_once($file = DIR."/core/classes/$namespace/$class_name.php", false) || //Core classes |
|
|
75
|
+ _require_once($file = DIR."/core/classes/$namespace/$class_name.php", false) || //Core classes |
|
76
|
76
|
_require_once($file = DIR."/core/thirdparty/$namespace/$class_name.php", false) || //Third party classes |
|
77
|
|
- _require_once($file = DIR."/core/traits/$namespace/$class_name.php", false) || //Core traits |
|
78
|
|
- _require_once($file = ENGINES."/$namespace/$class_name.php", false) || //Core engines |
|
79
|
|
- _require_once($file = MODULES."/../$namespace/$class_name.php", false) || //Classes in modules |
|
|
77
|
+ _require_once($file = DIR."/core/traits/$namespace/$class_name.php", false) || //Core traits |
|
|
78
|
+ _require_once($file = ENGINES."/$namespace/$class_name.php", false) || //Core engines |
|
|
79
|
+ _require_once($file = MODULES."/../$namespace/$class_name.php", false) || //Classes in modules |
|
80
|
80
|
_require_once($file = PLUGINS."/../$namespace/$class_name.php", false) //Classes in plugins |
|
81
|
81
|
) { |
|
82
|
82
|
$cache[$class] = realpath($file); |
nazar-pc /
CleverStyle-Framework
