added custom loaders in metadata 'app'

This commit is contained in:
Taras Machyshyn
2015-01-05 17:22:56 +02:00
parent 265373bdcb
commit 28fcdca977
+9 -5
View File
@@ -51,9 +51,13 @@ class Container
$obj = $this->$loadMethod();
$this->data[$name] = $obj;
} else {
$className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
if (!class_exists($className)) {
$className = '\Espo\Core\Loaders\\'.ucfirst($name);
$className = $this->get('metadata')->get('app.loaders.' . ucfirst($name));
if (!isset($className) || !class_exists($className)) {
$className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
if (!class_exists($className)) {
$className = '\Espo\Core\Loaders\\'.ucfirst($name);
}
}
if (class_exists($className)) {
@@ -64,7 +68,7 @@ class Container
return null;
}
protected function getServiceClassName($name, $default)
{
$metadata = $this->get('metadata');
@@ -204,7 +208,7 @@ class Container
$this->get('preferences')
);
}
private function loadCrypt()
{
return new \Espo\Core\Utils\Crypt(