From e2e561e66311480657412d03f3000fac4f93a6ee Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Sun, 11 Apr 2021 18:32:28 +0000
Subject: [PATCH] [DB][FKEY] Temporarily disable foreign key mapping, as there
 seems to be a bug in doctrine, which is under investigation

---
 src/DependencyInjection/Compiler/SchemaDefDriver.php | 2 +-
 src/Util/Common.php                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DependencyInjection/Compiler/SchemaDefDriver.php b/src/DependencyInjection/Compiler/SchemaDefDriver.php
index 3d217560c1..07aa580db3 100644
--- a/src/DependencyInjection/Compiler/SchemaDefDriver.php
+++ b/src/DependencyInjection/Compiler/SchemaDefDriver.php
@@ -109,7 +109,7 @@ class SchemaDefDriver extends StaticPHPDriver implements CompilerPassInterface
                 }
             }
 
-            if ($opts['foreign key'] ?? false) {
+            if (false && $opts['foreign key'] ?? false) {
                 foreach (['target', 'multiplicity'] as $f) {
                     if (!isset($opts[$f])) {
                         throw new \Exception("{$class_name}.{$name} doesn't have the required field `{$f}`");
diff --git a/src/Util/Common.php b/src/Util/Common.php
index aef285c5ea..d6c0b4ad5e 100644
--- a/src/Util/Common.php
+++ b/src/Util/Common.php
@@ -91,7 +91,7 @@ abstract class Common
 
     public static function userNickname(): ?string
     {
-        self::ensureLoggedIn()->getNickname();
+        return self::ensureLoggedIn()->getNickname();
     }
 
     public static function ensureLoggedIn(): LocalUser