Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-05 03:58:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-02-07 23:33:22 +01:00
parent f8f85b0092
commit 56a980d2ea
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataStorage/Database/DataMapperAbstract.php
View File

@ -2008,7 +2008,7 @@ class DataMapperAbstract implements DataMapperInterface
public static function populate(array $result, $obj = null) public static function populate(array $result, $obj = null)
{ {
$class = static::class; $class = static::class;
$class = empty(static::$model) ? \str_replace('Mapper', '', $class) : static::$model; // @todo: replace str_replace with substr!!! $class = empty(static::$model) ? \substr($class, 0, -6) : static::$model;
if (empty($result)) { if (empty($result)) {
$parts = \explode('\\', $class); $parts = \explode('\\', $class);
@ -2450,7 +2450,7 @@ class DataMapperAbstract implements DataMapperInterface
private static function getNullModelObj() private static function getNullModelObj()
{ {
$class = static::class; $class = static::class;
$class = empty(static::$model) ? \str_replace('Mapper', '', $class) : static::$model; // @todo replace str_replace with substr!!! $class = empty(static::$model) ? \substr($class, 0, -6) : static::$model;
$parts = \explode('\\', $class); $parts = \explode('\\', $class);
$name = $parts[$c = (\count($parts) - 1)]; $name = $parts[$c = (\count($parts) - 1)];
$parts[$c] = 'Null' . $name; $parts[$c] = 'Null' . $name;

8
Dispatcher/Dispatcher.php
View File

@ -68,11 +68,11 @@ final class Dispatcher implements DispatcherInterface
if (\is_array($controller)) { if (\is_array($controller)) {
if (isset($controller['dest'])) { if (isset($controller['dest'])) {
$controller = $controller['dest']; if (!empty($data) && !empty($controller['data'])) {
} $data = \array_merge($data, $controller['data']);
}
if (isset($controller['dest'])) { $controller = $controller['dest'];
$data = \array_merge($data, $controller['data']);
} }
} }