|
@@ -78,10 +78,10 @@ discard block |
|
|
block discarded – undo |
|
78
|
78
|
* Try to load classes from different places. If not found in one place - try in another. |
|
79
|
79
|
*/ |
|
80
|
80
|
if ( |
|
81
|
|
- file_exists($file = CORE."/classes/$namespace/$class_name.php") || //Core classes |
|
|
81
|
+ file_exists($file = CORE."/classes/$namespace/$class_name.php") || //Core classes |
|
82
|
82
|
file_exists($file = CORE."/thirdparty/$namespace/$class_name.php") || //Third party classes |
|
83
|
|
- file_exists($file = CORE."/traits/$namespace/$class_name.php") || //Core traits |
|
84
|
|
- file_exists($file = CORE."/drivers/$namespace/$class_name.php") || //Core drivers |
|
|
83
|
+ file_exists($file = CORE."/traits/$namespace/$class_name.php") || //Core traits |
|
|
84
|
+ file_exists($file = CORE."/drivers/$namespace/$class_name.php") || //Core drivers |
|
85
|
85
|
file_exists($file = MODULES."/../$namespace/$class_name.php") //Classes in modules |
|
86
|
86
|
) { |
|
87
|
87
|
$cache[$class] = realpath($file); |
|
@@ -197,7 +197,7 @@ discard block |
|
|
block discarded – undo |
|
197
|
197
|
foreach ($units as $time_frame => $key) { |
|
198
|
198
|
if ($time >= $time_frame) { |
|
199
|
199
|
$time_full = floor($time / $time_frame); |
|
200
|
|
- $time -= $time_full * $time_frame; |
|
|
200
|
+ $time -= $time_full * $time_frame; |
|
201
|
201
|
$res[] = $L->time($time_full, $key); |
|
202
|
202
|
} |
|
203
|
203
|
} |
Please login to merge, or discard this patch.