|
@@ -8,17 +8,19 @@ class Library
|
|
$class = explode('\\', $class);
|
|
$class = explode('\\', $class);
|
|
if (isset($class[3])) {
|
|
if (isset($class[3])) {
|
|
self::require(lcfirst($class[0]), lcfirst($class[1]) . DIRECTORY_SEPARATOR . $class[2] . DIRECTORY_SEPARATOR . $class[3]);
|
|
self::require(lcfirst($class[0]), lcfirst($class[1]) . DIRECTORY_SEPARATOR . $class[2] . DIRECTORY_SEPARATOR . $class[3]);
|
|
- } else {
|
|
|
|
|
|
+ } elseif (isset($class[2])) {
|
|
self::require(lcfirst($class[0]), lcfirst($class[1]) . DIRECTORY_SEPARATOR . $class[2]);
|
|
self::require(lcfirst($class[0]), lcfirst($class[1]) . DIRECTORY_SEPARATOR . $class[2]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
public static function require($app, $file)
|
|
public static function require($app, $file)
|
|
{
|
|
{
|
|
$project = Project::load($app);
|
|
$project = Project::load($app);
|
|
- $file = $project['path'] . $file . '.php';
|
|
|
|
- if (is_file($file) && empty(self::$file[$file])) {
|
|
|
|
- self::$file[$file] = true;
|
|
|
|
- require $file;
|
|
|
|
|
|
+ if ($project) {
|
|
|
|
+ $file = $project['path'] . $file . '.php';
|
|
|
|
+ if (is_file($file) && empty(self::$file[$file])) {
|
|
|
|
+ self::$file[$file] = true;
|
|
|
|
+ require $file;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
public static function apply($file, $app, $path)
|
|
public static function apply($file, $app, $path)
|