Skip to content

S
syncEnrollments
Commit 07d6ed57 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

refactoring the auto-loader.

parent 67ef4ea8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 12 deletions
system/loader.php
View file @ 07d6ed57
...@@ -47,15 +47,9 @@ class Loader { ...@@ -47,15 +47,9 @@ class Loader {
{ {
$file = strtolower(str_replace('\\', '/', $class)); $file = strtolower(str_replace('\\', '/', $class));
if (array_key_exists($class, static::$aliases)) if (array_key_exists($class, static::$aliases)) return class_alias(static::$aliases[$class], $class);
{
return class_alias(static::$aliases[$class], $class);
}
if ( ! static::load_from_registered($file)) ( ! static::load_from_registered($file)) or static::load_from_module($file);
{
static::load_from_module($file);
}
} }
/** /**
...@@ -104,10 +98,7 @@ class Loader { ...@@ -104,10 +98,7 @@ class Loader {
foreach (array($module.'models', $module.'libraries') as $directory) foreach (array($module.'models', $module.'libraries') as $directory)
{ {
if (file_exists($path = $directory.'/'.$file.EXT)) if (file_exists($path = $directory.'/'.$file.EXT)) return require $path;
{
return require $path;
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment