From 1d5b7274654781f859583548de8652170ea6f36e Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 15 Nov 2020 21:12:05 +0100
Subject: [PATCH] fix uri building bug and conditional loading bug

---
 DataStorage/Database/DataMapperAbstract.php | 1 +
 Uri/UriFactory.php                          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php
index 0ad4890ae..dc8057ce8 100644
--- a/DataStorage/Database/DataMapperAbstract.php
+++ b/DataStorage/Database/DataMapperAbstract.php
@@ -3132,6 +3132,7 @@ class DataMapperAbstract implements DataMapperInterface
                     foreach (self::$conditionals as $condKey => $condValue) {
                         if (($column = $value['mapper']::getColumnByMember($condKey)) === null
                             || ($condValue['models'] !== null && !\in_array($modelName, $condValue['models']))
+                            || ($value['conditional'] ?? false) === false
                         ) {
                             continue;
                         }
diff --git a/Uri/UriFactory.php b/Uri/UriFactory.php
index 61953849d..d2446a06d 100644
--- a/Uri/UriFactory.php
+++ b/Uri/UriFactory.php
@@ -118,7 +118,7 @@ final class UriFactory
         self::setQuery('/port', (string) $uri->getPort());
         self::setQuery('/base', \rtrim($uri->getBase(), '/'));
         self::setQuery('/rootPath', $uri->getRootPath());
-        self::setQuery('?', $uri->getQuery());
+        self::setQuery('?', '?' . $uri->getQuery());
         self::setQuery('%', $uri->__toString());
         self::setQuery('#', $uri->getFragment());
         self::setQuery('/', $uri->getPath());