asdasd
This commit is contained in:
@@ -4,6 +4,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace ModulesCore {
|
||||
|
||||
use App\AppPaths;
|
||||
use App\ConfigLoader;
|
||||
use App\KeycloakAuth;
|
||||
use App\PdoFactory;
|
||||
@@ -308,7 +309,7 @@ namespace ModulesCore {
|
||||
|
||||
private function modulePath(string $moduleName): string
|
||||
{
|
||||
return $this->projectRoot . '/modules/' . trim($moduleName, '/');
|
||||
return AppPaths::customAppPath($this->projectRoot, $moduleName);
|
||||
}
|
||||
|
||||
private function ensureBooted(string $moduleName): void
|
||||
@@ -520,7 +521,7 @@ namespace {
|
||||
return [];
|
||||
}
|
||||
|
||||
$path = dirname(__DIR__, 2) . '/modules/' . $module . '/design.json';
|
||||
$path = AppPaths::customAppPath(dirname(__DIR__, 2), $module) . '/design.json';
|
||||
if (!is_file($path)) {
|
||||
return [];
|
||||
}
|
||||
@@ -624,7 +625,7 @@ namespace {
|
||||
if (!function_exists('module_tpl')) {
|
||||
function module_tpl(string $module, string $name, array $data = []): void
|
||||
{
|
||||
$path = dirname(__DIR__, 2) . '/modules/' . $module . '/partials/' . $name . '.php';
|
||||
$path = AppPaths::customAppPath(dirname(__DIR__, 2), $module) . '/partials/' . $name . '.php';
|
||||
if (!is_file($path)) {
|
||||
echo '<!-- module_tpl(): not found -->';
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user