Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-11 09:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix install process

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-12-01 10:28:12 +01:00
parent cfb8cad454
commit 879691d68d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataStorage/Database/DataMapperAbstract.php
View File

@ -1494,7 +1494,7 @@ class DataMapperAbstract implements DataMapperInterface
}
$objects = $mapper::get($values);
$reflectionProperty->setValue($obj, !is_array($objects) ? [$objects] : $objects);
$reflectionProperty->setValue($obj, !is_array($objects) ? [$objects->getId() => $objects] : $objects);
if (!$accessible) {
$reflectionProperty->setAccessible(false);

8
Dispatcher/Dispatcher.php
View File

@ -107,6 +107,10 @@ class Dispatcher
$views = [];
$dispatch = explode(':', $controller);
if (!file_exists($path = __DIR__ . '/../../' . str_replace('\\', '/', $dispatch[0]) . '.php')) {
throw new PathException($path);
}
if (($c = count($dispatch)) === 3) {
/* Handling static functions */
$function = $dispatch[0] . '::' . $dispatch[2];
@ -170,10 +174,6 @@ class Dispatcher
private function getController(string $controller) /* : object */
{
if (!isset($this->controllers[$controller])) {
if (!file_exists($path = __DIR__ . '/../../' . str_replace('\\', '/', $controller) . '.php')) {
throw new PathException($path);
}
// If module controller use module manager for initialization
if (strpos('\Modules\Controller', $controller) === 0) {
$split = explode('\\', $controller);